Changeset 8376

Timestamp:

07/19/2008 05:56:35 PM (17 years ago)

Author:

ryan

Message:

IXR 0.71. Props jacobsantos. fixes #7227

Location:

trunk/wp-includes

Files:

• class-IXR.php (modified) (14 diffs)
• taxonomy.php (modified) (1 diff)
• version.php (modified) (1 diff)

trunk/wp-includes/class-IXR.php

@@ -23 +23 @@
     var $data;
     var $type;
+
     function IXR_Value ($data, $type = false) {
         $this->data = $data;
@@ -41 +42 @@
         }
     }
+
     function calculateType() {
         if ($this->data === true || $this->data === false) {
@@ -74 +76 @@
         }
     }
+
     function getXml() {
         /* Return XML for this value */
@@ -114 +117 @@
         return false;
     }
+
     function isStruct($array) {
         /* Nasty function to check if an array is a struct or not */
@@ -181 +185 @@
     }
     function tag_open($parser, $tag, $attr) {
-        $this->_currentTagContents = '';
+        $this->_currentTagContents = '';
         $this->currentTag = $tag;
         switch($tag) {
@@ -271 +275 @@
             }
         }
-        $this->_currentTagContents = '';
+        $this->_currentTagContents = '';
     }
 }
@@ -335 +339 @@
     function call($methodname, $args) {
         if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
+            return new IXR_Error(-32601, 'server error. requested method '.
+                $methodname.' does not exist.');
         }
         $method = $this->callbacks[$methodname];
@@ -348 +353 @@
             $method = substr($method, 5);
             if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
+                return new IXR_Error(-32601, 'server error. requested class method "'.
+                    $method.'" does not exist.');
             }
             // Call the method
@@ -355 +361 @@
             // It's a function - does it exist?
             if (is_array($method)) {
-                if (!method_exists($method[0], $method[1])) {
-                return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
-                }
+                if (!method_exists($method[0], $method[1])) {
+                    return new IXR_Error(-32601, 'server error. requested object method "'.
+                        $method[1].'" does not exist.');
+                }
             } else if (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
+                return new IXR_Error(-32601, 'server error. requested function "'.
+                    $method.'" does not exist.');
             }
             // Call the function
@@ -491 +499 @@
     var $message = false;
     var $debug = false;
-    var $timeout;
+    var $timeout;
     // Storage place for an error message
     var $error = false;
@@ -510 +518 @@
             $this->port = $port;
         }
-        $this->useragent = 'Incutio XML-RPC';
-        $this->timeout = $timeout;
+        $this->useragent = 'The Incutio XML-RPC PHP Library';
+        $this->timeout = $timeout;
     }
     function query() {
@@ -557 +565 @@
             }
             if (!$gettingHeaders) {
-                $contents .= trim($line)."\n";
+                $contents .= trim($line);
             }
         }
@@ -604 +612 @@
     function IXR_Error($code, $message) {
         $this->code = $code;
-        $this->message = htmlspecialchars($message);
+        $this->message = $message;
     }
     function getXml() {
@@ -666 +674 @@
         $this->minute = substr($iso, 12, 2);
         $this->second = substr($iso, 15, 2);
-        $this->timezone = substr($iso, 17);
     }
     function getIso() {
-        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
+        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second;
     }
     function getXml() {

trunk/wp-includes/taxonomy.php

@@ -762 +762 @@
     global $wpdb;
 
+    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
+    $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
+
     if ( is_int($term) ) {
         if ( 0 == $term )
             return 0;
         $where = 't.term_id = %d';
-    } else {
-        if ( '' === $term = sanitize_title($term) )
-            return 0;
-        $where = 't.slug = %s';
-    }
-
-    if ( !empty($taxonomy) )
-        return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
-
-    return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $term) );
+        if ( !empty($taxonomy) )
+            return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
+        else
+            return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+    }
+
+    if ( '' === $slug = sanitize_title($term) )
+        return 0;
+
+    $where = 't.slug = %s';
+    $else_where = 't.name = %s';
+
+    if ( !empty($taxonomy) ) {
+        if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $slug, $taxonomy), ARRAY_A) )
+            return $result;
+            
+        return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
+    }
+
+    if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $slug) ) )
+        return $result;
+
+    return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where", $term) );
 }
 

trunk/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 8202;
+$wp_db_version = 8370;
 
 ?>