Changeset 4373

Timestamp:

10/11/2006 09:19:10 AM (18 years ago)

Author:

markjaquith

Message:

Post meta caching fix by mdawaffe. fixes #3229

Location:

branches/2.0/wp-includes

Files:

• functions.php (modified) (8 diffs)
• template-functions-post.php (modified) (3 diffs)

branches/2.0/wp-includes/functions.php

@@ -422 +422 @@
     global $wpdb, $post_meta_cache;
 
+    $post_id = (int) $post_id;
+
     if ( $unique ) {
-        if ( $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key
-= '$key' AND post_id = '$post_id'") ) {
+        if ( $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = '$key' AND post_id = '$post_id'") ) {
             return false;
         }
@@ -435 +436 @@
     $wpdb->query("INSERT INTO $wpdb->postmeta (post_id,meta_key,meta_value) VALUES ('$post_id','$key','$value')");
 
-    $post_meta_cache['$post_id'][$key][] = $original;
+    $post_meta_cache[$post_id][$key][] = $original;
 
     return true;
@@ -443 +444 @@
     global $wpdb, $post_meta_cache;
 
+    $post_id = (int) $post_id;
+
     if ( empty($value) ) {
-        $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE
-post_id = '$post_id' AND meta_key = '$key'");
-    } else {
-        $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE
-post_id = '$post_id' AND meta_key = '$key' AND meta_value = '$value'");
+        $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key'");
+    } else {
+        $meta_id = $wpdb->get_var("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key' AND meta_value = '$value'");
     }
 
@@ -455 +456 @@
 
     if ( empty($value) ) {
-        $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id'
-AND meta_key = '$key'");
-        unset($post_meta_cache['$post_id'][$key]);
-    } else {
-        $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id'
-AND meta_key = '$key' AND meta_value = '$value'");
-        $cache_key = $post_meta_cache['$post_id'][$key];
+        $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key'");
+        unset($post_meta_cache[$post_id][$key]);
+    } else {
+        $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = '$post_id' AND meta_key = '$key' AND meta_value = '$value'");
+        $cache_key = $post_meta_cache[$post_id][$key];
         if ($cache_key) foreach ( $cache_key as $index => $data )
             if ( $data == $value )
-                unset($post_meta_cache['$post_id'][$key][$index]);
-    }
-
-    unset($post_meta_cache['$post_id'][$key]);
+                unset($post_meta_cache[$post_id][$key][$index]);
+    }
+
+    unset($post_meta_cache[$post_id][$key]);
 
     return true;
@@ -474 +473 @@
 function get_post_meta($post_id, $key, $single = false) {
     global $wpdb, $post_meta_cache;
+
+    $post_id = (int) $post_id;
 
     if ( isset($post_meta_cache[$post_id][$key]) ) {
@@ -508 +509 @@
     global $wpdb, $post_meta_cache;
 
+    $post_id = (int) $post_id;
+
     $original_value = $value;
     if ( is_array($value) || is_object($value) )
@@ -516 +519 @@
         $prev_value = $wpdb->escape(serialize($prev_value));
 
-    if (! $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key
-= '$key' AND post_id = '$post_id'") ) {
+    if (! $wpdb->get_var("SELECT meta_key FROM $wpdb->postmeta WHERE meta_key = '$key' AND post_id = '$post_id'") ) {
         return false;
     }
 
     if ( empty($prev_value) ) {
-        $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE
-meta_key = '$key' AND post_id = '$post_id'");
-        $cache_key = $post_meta_cache['$post_id'][$key];
+        $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE meta_key = '$key' AND post_id = '$post_id'");
+        $cache_key = $post_meta_cache[$post_id][$key];
         if ( !empty($cache_key) )
             foreach ($cache_key as $index => $data)
-                $post_meta_cache['$post_id'][$key][$index] = $original_value;
-    } else {
-        $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE
-meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'");
-        $cache_key = $post_meta_cache['$post_id'][$key];
+                $post_meta_cache[$post_id][$key][$index] = $original_value;
+    } else {
+        $wpdb->query("UPDATE $wpdb->postmeta SET meta_value = '$value' WHERE meta_key = '$key' AND post_id = '$post_id' AND meta_value = '$prev_value'");
+        $cache_key = $post_meta_cache[$post_id][$key];
         if ( !empty($cache_key) )
             foreach ($cache_key as $index => $data)
                 if ( $data == $original_prev )
-                    $post_meta_cache['$post_id'][$key][$index] = $original_value;
+                    $post_meta_cache[$post_id][$key][$index] = $original_value;
     }
 
@@ -1445 +1445 @@
         $post_meta_cache = array();
         foreach ($meta_list as $metarow) {
-            $mpid = $metarow['post_id'];
+            $mpid = (int) $metarow['post_id'];
             $mkey = $metarow['meta_key'];
             $mval = $metarow['meta_value'];

branches/2.0/wp-includes/template-functions-post.php

@@ -201 +201 @@
         $post_id = $id;
 
+    $post_id = (int) $post_id;
+
     if ( isset($post_meta_cache[$post_id]) )
         return $post_meta_cache[$post_id];
@@ -208 +210 @@
         $post_meta_cache = array();
         foreach ( $meta_list as $metarow ) {
-            $mpid = $metarow['post_id'];
+            $mpid = (int) $metarow['post_id'];
             $mkey = $metarow['meta_key'];
             $mval = $metarow['meta_value'];
@@ -257 +259 @@
 // this will probably change at some point...
 function the_meta() {
-    global $id, $post_meta_cache;
+    global $id;
 
     if ( $keys = get_post_custom_keys() ) {