Changeset 12782

Timestamp:

01/20/2010 11:01:09 PM (15 years ago)

Author:

ryan

Message:

Clear some warnings. see #11644

Location:

trunk/wp-admin

Files:

• includes/ms.php (modified) (1 diff)
• ms-admin.php (modified) (1 diff)
• ms-sites.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -1219 +1219 @@
     }
     $mu_media_buttons = get_site_option( 'mu_media_buttons', array() );
-    if ( !$mu_media_buttons[ 'image' ] && current_theme_supports( 'post-thumbnails' ) ) {
+    if ( empty($mu_media_buttons[ 'image' ]) && current_theme_supports( 'post-thumbnails' ) ) {
         echo "<div id='update-nag'>" . sprintf( __( "Warning! The current theme supports post thumbnails. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), admin_url( 'ms-options.php' ) ) . "</div>";
     }

trunk/wp-admin/ms-admin.php

@@ -22 +22 @@
 $c_blogs = $wpdb->get_var("SELECT COUNT(blog_id) FROM {$wpdb->blogs}");
 
-$user_text = sprintf( __ngettext( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
-$blog_text = sprintf( __ngettext( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) );
+$user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
+$blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) );
 
 $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );

trunk/wp-admin/ms-sites.php

@@ -15 +15 @@
     wp_die( __('You do not have permission to access this page.') );
 
-$id = intval( $_GET['id'] );
+$id = isset($_GET['id']) ? intval( $_GET['id'] ) : 0;
 $protocol = is_ssl() ? 'https://' : 'http://';
 
-if ( $_GET['updated'] == 'true' ) {
+if ( isset($_GET['updated']) && $_GET['updated'] == 'true' ) {
     ?>
     <div id="message" class="updated fade"><p>
@@ -71 +71 @@
 }
 
-switch ( $_GET['action'] ) {
+$action = isset($_GET['action']) ? $_GET['action'] : 'list';
+
+switch ( $action ) {
     // Edit blog
     case "editblog":
@@ -310 +312 @@
 
     // List blogs
+    case 'list':
     default:
         $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1;