sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add siteurl filter for ms upgrades, props nacin, fixes #12069

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12952 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ron Rennick 2010-02-04 19:26:38 +00:00
parent 071c7a8290
commit b21acae7f0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/ms-upgrade-site.php
View File

@ -33,8 +33,7 @@ switch ( $action ) {
echo "<ul>";
foreach ( (array) $blogs as $details ) {
if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
$blog_prefix = $wpdb->get_blog_prefix( $details[ 'blog_id' ] );
$siteurl = $wpdb->get_var( "SELECT option_value from {$blog_prefix}options WHERE option_name = 'siteurl'" );
$siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
echo "<li>$siteurl</li>";
$response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
if ( is_wp_error( $response ) )

2
wp-includes/ms-functions.php
View File

@ -272,7 +272,7 @@ function get_blog_option( $blog_id, $setting, $default = false ) {
return get_blog_option( $blog_id, 'siteurl' );
if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
$value = preg_replace( '|/+$|', '', $value );
$value = untrailingslashit( $value );
if (! @unserialize( $value ) )
$value = stripslashes( $value );