diff options
-rw-r--r-- | wp-admin/wpmu-themes.php | 20 | ||||
-rw-r--r-- | wp-includes/wpmu-functions.php | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/wp-admin/wpmu-themes.php b/wp-admin/wpmu-themes.php index bccd4b5..e62824a 100644 --- a/wp-admin/wpmu-themes.php +++ b/wp-admin/wpmu-themes.php @@ -33,17 +33,16 @@ $allowed_themes = get_site_allowed_themes(); </thead> <tbody id="plugins"> <?php - $total_theme_count = 0; - $activated_themes_count = 0; - foreach( (array) $themes as $key => $theme ) : - $total_theme_count++; + $total_theme_count = $activated_themes_count = 0; + foreach( (array) $themes as $key => $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++; + $activated_themes_count++; $class1 = ' active'; } else { $disabled = 'checked="checked" '; @@ -59,15 +58,20 @@ $allowed_themes = get_site_allowed_themes(); <td><?php echo $theme['Version'] ?></td> <td><?php echo $theme['Description'] ?></td> </tr> - <?php endforeach; ?> + <?php } ?> </tbody> </table> <p class="submit"> <input type='submit' value='<?php _e('Update Themes »') ?>' /></p> </form> -<p>Total Themes Installed: <?php echo $total_theme_count; ?><br /> -Themes Activated: <?php echo $activated_themes_count; ?></p> + + <h3><?php _e('Total')?></h3> + <p> + <?php printf(__('Themes Installed: %d'), $total_theme_count); ?> + <br /> + <?php printf(__('Themes Activated: %d'), $activated_themes_count); ?> + </p> </div> <?php include('admin-footer.php'); ?> diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php index e5171bf..d416d79 100644 --- a/wp-includes/wpmu-functions.php +++ b/wp-includes/wpmu-functions.php @@ -1962,7 +1962,7 @@ function add_existing_user_to_blog() { add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] ); delete_option( 'new_user_' . $key ); do_action( "added_existing_user", $details[ 'user_id' ] ); - wp_die( 'You have been added to this blog. Please visit the <a href="' . site_url() . '">homepage</a> or <a href="' . site_url( '/wp-admin/' ) . '">login</a> using your username and password.' ); + wp_die( sprintf(__('You have been added to this blog. Please visit the <a href="%s">homepage</a> or <a href="%s">login</a> using your username and password.'), site_url(), site_url( '/wp-admin/' ) ); } } } |