Changeset 885 for trunk/wp-includes/functions.php

Timestamp:

02/17/2004 04:56:29 AM (21 years ago)

Author:

saxmatt

Message:

Refactoring of template tags to use filters, use TABS (!!!), and general cleanliness, which is next to godliness. Some get_settings improvements, less globals.

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -265 +265 @@
 
 function get_settings($setting) {
-  global $wpdb, $cache_settings, $use_cache;
+    global $wpdb, $cache_settings, $use_cache;
     if (strstr($_SERVER['REQUEST_URI'], 'install.php')) {
         return false;
     }
+
     if ((empty($cache_settings)) OR (!$use_cache)) {
         $settings = get_alloptions();
@@ -275 +276 @@
         $settings = $cache_settings;
     }
-    if (!isset($settings->$setting)) {
-        return false;
-    }
-    else {
-        return $settings->$setting;
+
+    if (!isset($settings->$setting)) {
+        return false;
+    } else {
+        return stripslashes($settings->$setting);
     }
 }
 
 function get_alloptions() {
-    global $tableoptions, $wpdb;
-    $options = $wpdb->get_results("SELECT option_name, option_value FROM $tableoptions");
-    if ($options) {
-        foreach ($options as $option) {
-            $all_options->{$option->option_name} = $option->option_value;
-        }
-    }
-    return $all_options;
+    global $tableoptions, $wpdb;
+    $options = $wpdb->get_results("SELECT option_name, option_value FROM $tableoptions");
+    if ($options) {
+        foreach ($options as $option) {
+            // "When trying to design a foolproof system, 
+            //  never underestimate the ingenuity of the fools :)"
+            if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
+            $all_options->{$option->option_name} = $option->option_value;
+        }
+    }
+    return $all_options;
 }
 
@@ -1462 +1466 @@
 }
 
+function remove_slashes($string) {
+    return stripslashes(stripslashes($string));
+}
+
 ?>