Changes in branches/2.0 [5828:5841]

Location:

branches/2.0

Files:

• wp-admin/link-import.php (modified) (1 diff)
• wp-admin/options.php (modified) (4 diffs)
• wp-includes/functions.php (modified) (3 diffs)

branches/2.0/wp-admin/link-import.php

@@ -75 +75 @@
      <h2><?php _e('Importing...') ?></h2>
 <?php
-                $cat_id = $_POST['cat_id'];
-                if (($cat_id == '') || ($cat_id == 0)) {
-                    $cat_id  = 1;
-                }
+                $cat_id = abs( (int) $_POST['cat_id'] );
+                if ( $cat_id < 1 )
+                    $cat_id  = 1;
 
                 $opml_url = $_POST['opml_url'];

branches/2.0/wp-admin/options.php

@@ -152 +152 @@
 foreach ( (array) $options as $option) :
     $disabled = '';
+    $option->option_name = attribute_escape($option->option_name);
     if ( is_serialized($option->option_value) ) {
         if ( 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');
+            $value = maybe_unserialize($option->option_value);
             $options_to_update[] = $option->option_name;
             $class = 'all-options';
@@ -164 +165 @@
         }
     } else {
-        $value = wp_specialchars($option->option_value, 'single');
+        $value = $option->option_value;
         $options_to_update[] = $option->option_name;
         $class = 'all-options';
@@ -173 +174 @@
 <td>";
 
-    if (stristr($value, "\n")) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>";
-    else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />";
-    
+    if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>" . wp_specialchars($value) . "</textarea>";
+    else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . attribute_escape($value) . "'$disabled />";
+
     echo "</td>
     <td>$option->option_description</td>
@@ -183 +184 @@
   </table>
 <?php $options_to_update = implode(',', $options_to_update); ?>
-<p class="submit"><input type="hidden" name="page_options" value="<?php echo attribute_escape($options_to_update); ?>" /><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p>
+<p class="submit"><input type="hidden" name="page_options" value="<?php echo $options_to_update; ?>" /><input type="submit" name="Update" value="<?php _e('Update Options &raquo;') ?>" /></p>
   </form>
 </div>

branches/2.0/wp-includes/functions.php

@@ -300 +300 @@
 /* Options functions */
 
+// expects $setting to already be SQL-escaped
 function get_settings($setting) {
     global $wpdb;
@@ -377 +378 @@
 }
 
+// expects $option_name to NOT be SQL-escaped
 function update_option($option_name, $newvalue) {
     global $wpdb;
 
+    $safe_option_name = $wpdb->escape($option_name);
+
     if ( is_string($newvalue) )
         $newvalue = trim($newvalue);
 
     // If the new and old values are the same, no need to update.
-    $oldvalue = get_option($option_name);
+    $oldvalue = get_option($safe_option_name);
     if ( $newvalue == $oldvalue ) {
         return false;
@@ -417 +421 @@
 
 // thx Alex Stapleton, http://alex.vort-x.net/blog/
+// expects $name to NOT be SQL-escaped
 function add_option($name, $value = '', $description = '', $autoload = 'yes') {
     global $wpdb;
 
+    $safe_name = $wpdb->escape($name);
+
     // Make sure the option doesn't already exist
-    if ( false !== get_option($name) )
+    if ( false !== get_option($safe_name) )
         return;