golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update some old upgrade functions to use untrailingslashit(). 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-01-05 21:21:51 +00:00
parent 5fbd6657f4
commit c94b474b17
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wp-admin/includes/upgrade.php
View File

@ -1362,14 +1362,12 @@ function maybe_add_column($table_name, $column_name, $create_ddl) {
*/ */
function get_alloptions_110() { function get_alloptions_110() {
global $wpdb; global $wpdb;
if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) { $all_options = new stdClass;
foreach ($options as $option) { if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
// "When trying to design a foolproof system, foreach ( $options as $option ) {
// never underestimate the ingenuity of the fools :)" -- Dougal if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value); $option->option_value = untrailingslashit( $option->option_value );
if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value); $all_options->{$option->option_name} = stripslashes( $option->option_value );
if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
$all_options->{$option->option_name} = stripslashes($option->option_value);
} }
} }
return $all_options; return $all_options;
@ -1387,24 +1385,22 @@ function get_alloptions_110() {
function __get_option($setting) { function __get_option($setting) {
global $wpdb; global $wpdb;
if ( $setting == 'home' && defined( 'WP_HOME' ) ) { if ( $setting == 'home' && defined( 'WP_HOME' ) )
return preg_replace( '|/+$|', '', WP_HOME ); return untrailingslashit( WP_HOME );
}
if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) { if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
return preg_replace( '|/+$|', '', WP_SITEURL ); return untrailingslashit( WP_SITEURL );
}
$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting) ); $option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
if ( 'home' == $setting && '' == $option ) if ( 'home' == $setting && '' == $option )
return __get_option('siteurl'); return __get_option( 'siteurl' );
if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting ) if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
$option = preg_replace('|/+$|', '', $option); $option = untrailingslashit( $option );
@ $kellogs = unserialize($option); @ $kellogs = unserialize( $option );
if ($kellogs !== false) if ( $kellogs !== false )
return $kellogs; return $kellogs;
else else
return $option; return $option;