diff -urN wordpress-mu-2.6-rc1/wp-admin/admin-header.php wordpress-mu-2.6/wp-admin/admin-header.php --- wordpress-mu-2.6-rc1/wp-admin/admin-header.php 2008-07-10 18:09:16.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/admin-header.php 2008-07-17 16:33:08.000000000 +0200 @@ -110,7 +110,7 @@ -

%2$s!'), 'profile.php', $user_identity) ?> | | Help') . ' | ' . __('Forums') ); if ( $gears_compat ) { ?> |

+

%2$s!'), 'profile.php', $user_identity) ?> | Help') . ' | ' . __('Forums') ); if ( $gears_compat ) { ?> |

+

%s directory and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?>

+ diff -urN wordpress-mu-2.6-rc1/wp-admin/setup-config.php wordpress-mu-2.6/wp-admin/setup-config.php --- wordpress-mu-2.6-rc1/wp-admin/setup-config.php 2008-07-15 19:22:59.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/setup-config.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,162 +0,0 @@ -The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now.

"); - -// Check if wp-config.php exists above the root directory -if (file_exists('../../wp-config.php')) - wp_die("

The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now.

"); - -if (isset($_GET['step'])) - $step = $_GET['step']; -else - $step = 0; - -function display_header(){ - header( 'Content-Type: text/html; charset=utf-8' ); -?> - - - - -WordPress › Setup Configuration File - - - - -

WordPress

- - -

Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.

-
    -
  1. Database name
    2. -
  2. Database username
    3. -
  3. Database password
    4. -
  4. Database host
    5. -
  5. Table prefix (if you want to run more than one WordPress in a single database)
    6. -
-

If for any reason this automatic file creation doesn't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open wp-config-sample.php in a text editor, fill in your information, and save it as wp-config.php.

-

In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…

- -

Let’s go!

- -
-

Below you should enter your database connection details. If you're not sure about these, contact your host.

- - - - - - - - - - - - - - - - - - - - - - - - - - -
The name of the database you want to run WP in.
Your MySQL username
...and MySQL password.
99% chance you won't need to change this value.
If you want to run multiple WordPress installations in a single database, change this.
-

-
-error) ) - wp_die($wpdb->error->get_error_message()); - - $handle = fopen('../wp-config.php', 'w'); - - foreach ($configFile as $line_num => $line) { - switch (substr($line,0,16)) { - case "define('DB_NAME'": - fwrite($handle, str_replace("putyourdbnamehere", $dbname, $line)); - break; - case "define('DB_USER'": - fwrite($handle, str_replace("'usernamehere'", "'$uname'", $line)); - break; - case "define('DB_PASSW": - fwrite($handle, str_replace("'yourpasswordhere'", "'$passwrd'", $line)); - break; - case "define('DB_HOST'": - fwrite($handle, str_replace("localhost", $dbhost, $line)); - break; - case '$table_prefix =': - fwrite($handle, str_replace('wp_', $prefix, $line)); - break; - default: - fwrite($handle, $line); - } - } - fclose($handle); - chmod('../wp-config.php', 0666); - - display_header(); -?> -

All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…

- -

Run the install

- - - diff -urN wordpress-mu-2.6-rc1/wp-admin/users.php wordpress-mu-2.6/wp-admin/users.php --- wordpress-mu-2.6-rc1/wp-admin/users.php 2008-06-30 11:23:01.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/users.php 2008-07-22 19:41:46.000000000 +0200 @@ -264,8 +264,9 @@ if( ($username != null && is_site_admin( $username ) == false ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) { $location = 'users.php?update=add_existing'; } else { - add_user_to_blog('', $user_id, $_REQUEST[ 'new_role' ]); - do_action( "added_existing_user", $user_id ); + $newuser_key = substr( md5( $user_id ), 0, 5 ); + add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user->user_email, 'role' => $_REQUEST[ 'new_role' ] ) ); + wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), "Hi,\n\nYou have been invited to join '" . get_option( 'blogname' ) . "' at\n" . site_url() . "\nPlease click the following link to confirm the invite:\n" . site_url( "/newbloguser/$newuser_key/" ) ); $location = 'users.php?update=add'; } wp_redirect("$location"); diff -urN wordpress-mu-2.6-rc1/wp-admin/wpmu-blogs.php wordpress-mu-2.6/wp-admin/wpmu-blogs.php --- wordpress-mu-2.6-rc1/wp-admin/wpmu-blogs.php 2008-05-17 00:45:53.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/wpmu-blogs.php 2008-07-25 12:56:10.000000000 +0200 @@ -294,23 +294,16 @@ $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' "; if( isset($_GET['blog_name']) ) { - $query = "SELECT blog_id, {$wpdb->blogs}.domain, {$wpdb->blogs}.path, registered, last_updated - FROM {$wpdb->blogs}, {$wpdb->site} - WHERE site_id = '{$wpdb->siteid}' - AND {$wpdb->blogs}.site_id = {$wpdb->site}.id - AND ( {$wpdb->blogs}.domain LIKE '%{$s}%' OR {$wpdb->blogs}.path LIKE '%{$s}%' )"; + $query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$s}%' OR {$wpdb->blogs}.path LIKE '%{$s}%' ) "; } elseif( isset($_GET['blog_id']) ) { - $query = "SELECT * - FROM {$wpdb->blogs} - WHERE site_id = '{$wpdb->siteid}' - AND blog_id = '".intval($_GET['s'])."'"; + $query .= " AND blog_id = '".intval($_GET['s'])."' "; } elseif( isset($_GET['blog_ip']) ) { $query = "SELECT * FROM {$wpdb->blogs}, {$wpdb->registration_log} WHERE site_id = '{$wpdb->siteid}' AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id AND {$wpdb->registration_log}.IP LIKE ('%{$s}%')"; - } + } if( isset( $_GET['sortby'] ) == false ) { $_GET['sortby'] = 'id'; @@ -328,15 +321,13 @@ $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC'; - if( !empty($_GET['s']) ) { - $blog_list = $wpdb->get_results( $query, ARRAY_A ); - $total = count($blog_list); + if( !empty($s) ) { + $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(blog_id)', $query) ); } else { - $total = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' "); + $total = $wpdb->get_var( "SELECT COUNT(blog_id) FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' "); } $query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num ); - $blog_list = $wpdb->get_results( $query, ARRAY_A ); // Pagination @@ -357,7 +348,7 @@

-
+ @@ -396,7 +387,7 @@ 'users' => __('Users'), 'plugins' => __('Actions') ); - $posts_columns = apply_filters('manage_posts_columns', $posts_columns); + $posts_columns = apply_filters('wpmu_blogs_columns', $posts_columns); // you can not edit these at the moment $posts_columns['control_edit'] = ''; diff -urN wordpress-mu-2.6-rc1/wp-admin/wpmu-edit.php wordpress-mu-2.6/wp-admin/wpmu-edit.php --- wordpress-mu-2.6-rc1/wp-admin/wpmu-edit.php 2008-07-11 17:05:19.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/wpmu-edit.php 2008-07-28 18:28:11.000000000 +0200 @@ -95,9 +95,9 @@ check_admin_referer('add-blog'); $blog = $_POST['blog']; - $domain = ereg_replace("[^A-Za-z0-9]", "", strtolower( wp_specialchars( $blog['domain'] ) ) ); - $email = wp_specialchars( $blog['email'] ); - $title = stripslashes( wp_specialchars( $blog['title'] ) ); + $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) ); + $email = sanitize_email( $blog[ 'email' ] ); + $title = $blog[ 'title' ]; if ( empty($domain) || empty($email)) wp_die( __('Missing blog address or email address.') ); @@ -129,7 +129,7 @@ if( !is_wp_error($id) ) { if( get_user_option( $user_id, 'primary_blog' ) == 1 ) update_user_option( $user_id, 'primary_blog', $id, true ); - $content_mail = sprintf( __( "New blog created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, $title ); + $content_mail = sprintf( __( "New blog created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Blog Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'add-blog'), $_SERVER['HTTP_REFERER'] ) ); exit(); @@ -241,6 +241,7 @@ $wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpdb->base_prefix . $id . "_capabilities', 'a:1:{s:" . strlen( $_POST['new_role'] ) . ":\"" . $_POST['new_role'] . "\";b:1;}')" ); } } + do_action( 'wpmu_update_blog_options' ); wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id ); break; diff -urN wordpress-mu-2.6-rc1/wp-admin/wpmu-options.php wordpress-mu-2.6/wp-admin/wpmu-options.php --- wordpress-mu-2.6-rc1/wp-admin/wpmu-options.php 2008-05-15 19:43:29.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/wpmu-options.php 2008-07-28 17:33:00.000000000 +0200 @@ -49,9 +49,9 @@ ?>
-
-
-
+
+
+
diff -urN wordpress-mu-2.6-rc1/wp-admin/wpmu-themes.php wordpress-mu-2.6/wp-admin/wpmu-themes.php --- wordpress-mu-2.6-rc1/wp-admin/wpmu-themes.php 2008-05-15 18:35:59.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/wpmu-themes.php 2008-07-22 13:02:58.000000000 +0200 @@ -33,13 +33,17 @@ $theme ) : + $total_theme_count++; $theme_key = wp_specialchars($theme['Stylesheet']); $class = ('alt' == $class) ? '' : 'alt'; $class1 = $enabled = $disabled = ''; if( isset( $allowed_themes[ $theme_key ] ) == true ) { $enabled = 'checked="checked" '; + $activated_themes_count++; $class1 = ' active'; } else { $disabled = 'checked="checked" '; @@ -62,6 +66,8 @@

' />

+

Total Themes Installed:
+Themes Activated:

diff -urN wordpress-mu-2.6-rc1/wp-admin/wpmu-users.php wordpress-mu-2.6/wp-admin/wpmu-users.php --- wordpress-mu-2.6-rc1/wp-admin/wpmu-users.php 2008-05-15 18:35:59.000000000 +0200 +++ wordpress-mu-2.6/wp-admin/wpmu-users.php 2008-07-25 12:56:10.000000000 +0200 @@ -68,10 +68,9 @@ $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC'; if( !empty( $s )) { - $user_list = $wpdb->get_results( $query, ARRAY_A ); - $total = count($user_list); + $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(ID)', $query) ); } else { - $total = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->users}"); + $total = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users}"); } $query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num ); @@ -87,7 +86,7 @@ )); ?>

-
+
@@ -122,7 +121,7 @@ 'registered' => __('Registered'), 'blogs' => '' ); - $posts_columns = apply_filters('manage_posts_columns', $posts_columns); + $posts_columns = apply_filters('wpmu_users_columns', $posts_columns); ?> diff -urN wordpress-mu-2.6-rc1/wp-config-sample.php wordpress-mu-2.6/wp-config-sample.php --- wordpress-mu-2.6-rc1/wp-config-sample.php 2008-07-16 16:06:33.000000000 +0200 +++ wordpress-mu-2.6/wp-config-sample.php 2008-07-21 17:55:54.000000000 +0200 @@ -15,6 +15,7 @@ // to get keys generated for you, or just make something up. Each key should have a different phrase. define('AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase. define('SECURE_AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase. +define('SECURE_AUTH_SALT', 'put your unique phrase here'); // Change this to a unique phrase. define('LOGGED_IN_KEY', 'put your unique phrase here'); // Change this to a unique phrase. define('SECRET_KEY', 'put your unique phrase here'); // Change these to unique phrases. define('SECRET_SALT', 'put your unique phrase here'); diff -urN wordpress-mu-2.6-rc1/wp-includes/wpmu-functions.php wordpress-mu-2.6/wp-includes/wpmu-functions.php --- wordpress-mu-2.6-rc1/wp-includes/wpmu-functions.php 2008-07-16 16:06:33.000000000 +0200 +++ wordpress-mu-2.6/wp-includes/wpmu-functions.php 2008-07-28 18:28:29.000000000 +0200 @@ -109,7 +109,7 @@ function get_id_from_blogname( $name ) { global $wpdb, $current_site; - if( constant( 'VHOST' ) ) { + if( constant( 'VHOST' ) == 'yes' ) { $domain = $name . '.' . $current_site->domain; $path = $current_site->path; } else { @@ -360,6 +360,9 @@ if ( $blog_id == $new_blog ) return; + $wp_object_cache->switched_cache[ $blog_id ] = $wp_object_cache->cache; + unset( $wp_object_cache->cache ); + $wpdb->set_blog_id($new_blog); $table_prefix = $wpdb->prefix; $prev_blog_id = $blog_id; @@ -388,6 +391,9 @@ if ( $blog_id == $blog ) return; + $wp_object_cache->cache = $wp_object_cache->switched_cache[ $blog ]; + unset( $wp_object_cache->switched_cache[ $blog ] ); + $wpdb->set_blog_id($blog); $prev_blog_id = $blog_id; $blog_id = $blog; @@ -824,7 +830,7 @@ $errors = new WP_Error(); - $user_name = sanitize_user($user_name); + $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) ); $user_email = sanitize_email( $user_email ); if ( empty( $user_name ) ) @@ -921,7 +927,7 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') { global $wpdb, $domain, $base; - $blogname = sanitize_user( $blogname ); + $blogname = preg_replace( "/\s+/", '', sanitize_user( $blogname, true ) ); $blog_title = strip_tags( $blog_title ); $blog_title = substr( $blog_title, 0, 50 ); @@ -1020,7 +1026,7 @@ function wpmu_signup_user($user, $user_email, $meta = '') { global $wpdb; - $user = sanitize_user( $user ); + $user = preg_replace( "/\s+/", '', sanitize_user( $user, true ) ); $user_email = sanitize_email( $user_email ); $key = substr( md5( time() . rand() . $user_email ), 0, 16 ); @@ -1145,7 +1151,7 @@ } function wpmu_create_user( $user_name, $password, $email) { - $user_name = ereg_replace("[^A-Za-z0-9]", "", $user_name); + $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) ); if ( username_exists($user_name) ) return false; @@ -1165,7 +1171,9 @@ } function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) { - $domain = sanitize_user( $domain ); + $domain = preg_replace( "/\s+/", '', sanitize_user( $domain, true ) ); + if( constant( 'VHOST' ) == 'yes' ) + $domain = str_replace( '@', '', $domain ); $title = strip_tags( $title ); $user_id = (int) $user_id; @@ -1896,47 +1904,6 @@ $wp_object_cache->non_persistent_groups = array('comment', 'counts'); } -// support a GET parameter for disabling the flash uploader -function wpmu_upload_flash($flash) { - if ( array_key_exists('flash', $_REQUEST) ) - $flash = !empty($_REQUEST['flash']); - return $flash; -} - -add_filter('flash_uploader', 'wpmu_upload_flash'); - -function wpmu_upload_flash_bypass() { - echo '

'; - printf( __('You are using the Flash uploader. Problems? Try the Browser uploader instead.'), add_query_arg('flash', 0) ); - echo '

'; -} - -add_action('post-flash-upload-ui', 'wpmu_upload_flash_bypass'); - -function wpmu_upload_html_bypass() { - echo '

'; - if ( array_key_exists('flash', $_REQUEST) ) - // the user manually selected the browser uploader, so let them switch back to Flash - printf( __('You are using the Browser uploader. Try the Flash uploader instead.'), add_query_arg('flash', 1) ); - else - // the user probably doesn't have Flash - printf( __('You are using the Browser uploader.') ); - - echo '

'; -} - -add_action('post-flash-upload-ui', 'wpmu_upload_flash_bypass'); -add_action('post-html-upload-ui', 'wpmu_upload_html_bypass'); - -// make sure the GET parameter sticks when we submit a form -function wpmu_upload_bypass_url($url) { - if ( array_key_exists('flash', $_REQUEST) ) - $url = add_query_arg('flash', intval($_REQUEST['flash'])); - return $url; -} - -add_filter('media_upload_form_url', 'wpmu_upload_bypass_url'); - function mu_locale( $locale ) { if( defined('WP_INSTALLING') == false ) { $mu_locale = get_option('WPLANG'); @@ -1977,4 +1944,26 @@ } } add_action( 'template_redirect', 'maybe_redirect_404' ); + +function remove_tinymce_media_button( $buttons ) { + unset( $buttons[ array_search( 'media', $buttons ) ] ); + return $buttons; +} +add_filter( 'mce_buttons_2', 'remove_tinymce_media_button' ); + +function add_existing_user_to_blog() { + if( false !== strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) { + $parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] ); + $key = array_pop( $parts ); + if( $key == '' ) + $key = array_pop( $parts ); + $details = get_option( "new_user_" . $key ); + if( is_array( $details ) ) { + add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] ); + do_action( "added_existing_user", $details[ 'user_id' ] ); + wp_die( 'You have been added to this blog. Please visit the homepage or login using your username and password.' ); + } + } +} +add_action( 'init', 'add_existing_user_to_blog' ); ?> diff -urN wordpress-mu-2.6-rc1/wp-load.php wordpress-mu-2.6/wp-load.php --- wordpress-mu-2.6-rc1/wp-load.php 2008-06-24 19:00:10.000000000 +0200 +++ wordpress-mu-2.6/wp-load.php 2008-07-28 17:11:07.000000000 +0200 @@ -36,14 +36,14 @@ // A config file doesn't exist // Set a path for the link to the installer - if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = ''; - else $path = 'wp-admin/'; + if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '../'; + else $path = ''; // Die with an error message require_once( ABSPATH . '/wp-includes/classes.php' ); require_once( ABSPATH . '/wp-includes/functions.php' ); require_once( ABSPATH . '/wp-includes/plugin.php' ); - wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.

Create a Configuration File"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress › Error"/*/WP_I18N_ERROR_TITLE*/); + wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a wp-config.php file. I need this before we can get started.

Create a Configuration File"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress › Error"/*/WP_I18N_ERROR_TITLE*/); } diff -urN wordpress-mu-2.6-rc1/wp-login.php wordpress-mu-2.6/wp-login.php --- wordpress-mu-2.6-rc1/wp-login.php 2008-07-15 19:22:59.000000000 +0200 +++ wordpress-mu-2.6/wp-login.php 2008-07-23 15:36:56.000000000 +0200 @@ -129,6 +129,13 @@ do_action('retreive_password', $user_login); // Misspelled and deprecated do_action('retrieve_password', $user_login); + $allow = apply_filters('allow_password_reset', true, $user_data->ID); + + if ( ! $allow ) + return new WP_Error('no_password_reset', __('Password reset is not allowed for this user')); + else if ( is_wp_error($allow) ) + return $allow; + $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login)); if ( empty($key) ) { // Generate something random for a key... diff -urN wordpress-mu-2.6-rc1/wp-settings.php wordpress-mu-2.6/wp-settings.php --- wordpress-mu-2.6-rc1/wp-settings.php 2008-07-09 21:51:04.000000000 +0200 +++ wordpress-mu-2.6/wp-settings.php 2008-07-21 11:48:36.000000000 +0200 @@ -299,7 +299,8 @@ if ( !defined('PLUGINDIR') ) define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat. -$current_site->site_name = get_site_option('site_name'); +if( !isset($current_site->site_name) ) + $current_site->site_name = get_site_option('site_name'); if( $current_site->site_name == false ) $current_site->site_name = ucfirst( $current_site->domain ); diff -urN wordpress-mu-2.6-rc1/wp-signup.php wordpress-mu-2.6/wp-signup.php --- wordpress-mu-2.6-rc1/wp-signup.php 2008-07-11 13:31:05.000000000 +0200 +++ wordpress-mu-2.6/wp-signup.php 2008-07-22 14:10:06.000000000 +0200 @@ -417,7 +417,10 @@ $newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/'; else $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path; - printf(__("

The blog you were looking for, %s doesn't exist but you can create it now!

"), $newblog ); + if ($active_signup == 'blog' || $active_signup == 'all') + printf(__("

The blog you were looking for, %s doesn't exist but you can create it now!

"), $newblog ); + else + printf(__("

The blog you were looking for, %s doesn't exist.

"), $newblog ); } break; }