WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Options system can now transparently handle arrays and objects. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@1478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2004-07-23 09:14:30 +00:00
parent 52c6237962
commit c0b93707a1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/functions.php
View File

@ -299,7 +299,7 @@ function get_settings($setting) {
if ( isset($cache_settings->$setting) ) if ( isset($cache_settings->$setting) )
return $cache_settings->$setting; return $cache_settings->$setting;
else else
return $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'"); return @ unserialize( $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'") );
} }
function get_alloptions() { function get_alloptions() {
@ -311,7 +311,7 @@ function get_alloptions() {
if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value); if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value); if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value); if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
$all_options->{$option->option_name} = $option->option_value; @$all_options->{$option->option_name} = unserialize($option->option_value);
} }
} }
return $all_options; return $all_options;
@ -319,7 +319,9 @@ function get_alloptions() {
function update_option($option_name, $newvalue) { function update_option($option_name, $newvalue) {
global $wpdb, $cache_settings; global $wpdb, $cache_settings;
$newvalue = $newvalue; if ( is_array($newvalue) || is_object($value) )
$newvalue = serialize($newvalue);
$newvalue = trim($newvalue); // I can't think of any situation we wouldn't want to trim $newvalue = trim($newvalue); // I can't think of any situation we wouldn't want to trim
// If the new and old values are the same, no need to update. // If the new and old values are the same, no need to update.
@ -335,9 +337,12 @@ function update_option($option_name, $newvalue) {
// thx Alex Stapleton, http://alex.vort-x.net/blog/ // thx Alex Stapleton, http://alex.vort-x.net/blog/
function add_option($name, $value='') { function add_option($name, $value = '') {
// Adds an option if it doesn't already exist // Adds an option if it doesn't already exist
global $wpdb; global $wpdb;
if ( is_array($value) || is_object($value) )
$value = serialize($value);
if(!get_settings($name)) { if(!get_settings($name)) {
$name = $wpdb->escape($name); $name = $wpdb->escape($name);
$value = $wpdb->escape($value); $value = $wpdb->escape($value);