Changeset 1355 for trunk/wp-admin/optionhandler.php

Timestamp:

05/24/2004 08:22:18 AM (21 years ago)

Author:

saxmatt

Message:

Giant commit, sorry mailing list people. Move all table names to new $wpdb versions. Works but the whole app needs thorough testing now.

File:

• trunk/wp-admin/optionhandler.php (modified) (4 diffs)

trunk/wp-admin/optionhandler.php

@@ -10 +10 @@
 function get_option_widget($option_result, $editable, $between)
 {
-    global $wpdb, $tableoptionvalues;
+    global $wpdb;
     $disabled = $editable ? '' : 'disabled';
 
@@ -48 +48 @@
 
             $select = $wpdb->get_results("SELECT optionvalue, optionvalue_desc "
-                                         ."FROM $tableoptionvalues "
+                                         ."FROM $wpdb->optionvalues "
                                          ."WHERE option_id = $option_result->option_id "
                                          ."ORDER BY optionvalue_seq");
@@ -67 +67 @@
         case 7: // SQL select
             // first get the sql to run
-            $sql = $wpdb->get_var("SELECT optionvalue FROM $tableoptionvalues WHERE option_id = $option_result->option_id");
+            $sql = $wpdb->get_var("SELECT optionvalue FROM $wpdb->optionvalues WHERE option_id = $option_result->option_id");
             if (!$sql) {
                 return $option_result->option_name . $editable;
@@ -101 +101 @@
 
 function validate_option($option, $name, $val) {
-    global $wpdb, $tableoptionvalues;
+    global $wpdb;
     $msg = '';
     switch ($option->option_type) {
         case 6: // range
             // get range
-            $range = $wpdb->get_row("SELECT optionvalue_max, optionvalue_min FROM $tableoptionvalues WHERE option_id = $option->option_id");
+            $range = $wpdb->get_row("SELECT optionvalue_max, optionvalue_min FROM $wpdb->optionvalues WHERE option_id = $option->option_id");
             if ($range) {
                 if (($val < $range->optionvalue_min) || ($val > $range->optionvalue_max)) {