Changeset 5834

Timestamp:

08/01/2007 07:25:33 PM (19 years ago)

Author:

markjaquith

Message:

Sanitize option names in options.php, use current escaping functions. for 2.0.x

File:

• branches/2.0/wp-admin/options.php (modified) (4 diffs)

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>