Changeset 2746630

Timestamp:

06/22/2022 07:23:08 PM (2 years ago)

Author:

jarednova

Message:

Update to 1.19.2

Location:

timber-library/trunk/lib

Files:

• Term.php (modified) (4 diffs)
• Timber.php (modified) (1 diff)

timber-library/trunk/lib/Term.php

@@ -156 +156 @@
     /**
      * @internal
-     * @param int $tid
+     * @param int $tid
      * @return mixed
      */
@@ -164 +164 @@
         }
         $tid = self::get_tid($tid);
+
+
+
+
+
+
+
+
+
+
+
+
+
 
         if ( isset($this->taxonomy) && strlen($this->taxonomy) ) {
@@ -182 +195 @@
      * @internal
      * @param int $tid
-     * @return int
-     */
-    protected function get_tid( $tid ) {
+     * @return int
+     */
+    protected function get_tid( $tid ) {
         global $wpdb;
         if ( is_numeric($tid) ) {
@@ -193 +206 @@
         }
         if ( is_numeric($tid) ) {
-            $query = $wpdb->prepare("SELECT * FROM $wpdb->terms WHERE term_id = %d", $tid);
+            $query = $wpdb->prepare("SELECT  FROM $wpdb->terms WHERE term_id = %d", $tid);
         } else {
-            $query = $wpdb->prepare("SELECT * FROM $wpdb->terms WHERE slug = %s", $tid);
-        }
-        $result = $wpdb->get_row($query);
-        if ( isset($result->term_id) ) {
-            $result->ID = $result->term_id;
-            $result->id = $result->term_id;
-            return $result->ID;
+            $query = $wpdb->prepare("SELECT term_id FROM $wpdb->terms WHERE slug = %s", $tid);
+        }
+        $result = $wpdb->get_col($query);
+        if ( $result ) {
+            if ( count($result) == 1) {
+                return $result[0];
+            }
+            return $result;
         }
         return 0;

timber-library/trunk/lib/Timber.php

@@ -36 +36 @@
 class Timber {
 
-    public static $version = '1.19.1';
+    public static $version = '1.19.';
     public static $locations;
     public static $dirname = 'views';