Changeset 4383

Timestamp:

10/13/06 00:23:25 (2 years ago)

Author:

markjaquith

Message:

cleanup [4382] a bit

Files:

• trunk/wp-admin/admin-functions.php (modified) (3 diffs)
• trunk/wp-admin/options.php (modified) (1 diff)
• trunk/wp-includes/functions.php (modified) (3 diffs)
• trunk/wp-includes/post.php (modified) (2 diffs)
• trunk/wp-includes/user.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -984 +984 @@
-
-        if ( is_serialized($entry['meta_value']) ) {
-'s' == $entry['meta_value']{0}
+is_serialized_string($entry['meta_value'])
-                // this is a serialized string, so we should display it
-                $entry['meta_value'] = maybe_unserialize($entry['meta_value']);
@@ -1069 +1069 @@
-    $metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect'])));
-    $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput'])));
-prepare_data
+maybe_serialize
-    $metavalue = $wpdb->escape($metavalue);
-
@@ -1101 +1101 @@
-function update_meta($mid, $mkey, $mvalue) {
-    global $wpdb;
-if ( is_serialized(stripslashes($mvalue)) ) // $mvalue looks to be already serialized, so we should serialize it again to prevent the data from coming out in a different form than it came in
-   $mvalue = serializ
+$mvalue = maybe_serialize(stripslashes($mvalue));
+$mvalue = $wpdb->escap
-    $mid = (int) $mid;
-    return $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'");

trunk/wp-admin/options.php

@@ -129 +129 @@
-    $disabled = '';
-    if ( is_serialized($option->option_value) ) {
-'s' == $option->option_value{0}
+is_serialized_string($option->option_value)
-            // this is a serialized string, so we should display it
-            $value = wp_specialchars(maybe_unserialize($option->option_value), 'single');

trunk/wp-includes/functions.php

@@ -258 +258 @@
-
-    $_newvalue = $newvalue;
-prepare_data
+maybe_serialize
-
-    wp_cache_set($option_name, $newvalue, 'options');
@@ -280 +280 @@
-        return;
-
-prepare_data
+maybe_serialize
-
-    wp_cache_set($name, $value, 'options');
@@ -302 +302 @@
-}
-
-prepare_data
+maybe_serialize
-    if ( is_string($data) )
-        $data = trim($data);

trunk/wp-includes/post.php

@@ -232 +232 @@
-    $post_meta_cache[$post_id][$key][] = $value;
-
-prepare_data
+maybe_serialize
-    $value = $wpdb->escape($value);
-
@@ -311 +311 @@
-
-    $original_value = $value;
-prepare_data
+maybe_serialize
-    $value = $wpdb->escape($value);
-
-    $original_prev = $prev_value;
-prepare_data
+maybe_serialize
-    $prev_value = $wpdb->escape($prev_value);
-

trunk/wp-includes/user.php

@@ -117 +117 @@
-    // FIXME: usermeta data is assumed to be already escaped
-    $meta_value = stripslashes($meta_value);
-prepare_data
+maybe_serialize
-    $meta_value = $wpdb->escape($meta_value);
-