Changeset 12800

Timestamp:

01/22/2010 10:14:22 PM (17 years ago)

Author:

ryan

Message:

Fix warnings

Location:

trunk

Files:

• wp-admin/ms-sites.php (modified) (5 diffs)
• wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-admin/ms-sites.php

@@ -316 +316 @@
                 $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1;
                 $num = ( isset($_GET['num'] ) && intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15;
-                $s = wp_specialchars( trim( $_GET[ 's' ] ) );
+                $s = isset($_GET['s']) ? esc_attr( trim( $_GET[ 's' ] ) ) : '';
                 $like_s = like_escape($s);
 
@@ -333 +333 @@
                 }
 
-                if ( isset( $_GET['sortby'] ) == false ) {
-                        $_GET['sortby'] = 'id';
+                $order_by = isset( $_GET['sortby'] ) ? $_GET['sortby'] : 'id';
+
+                if ( $order_by == 'registered' ) {
+                        $query .= ' ORDER BY registered ';
+                } elseif ( $order_by == 'lastupdated' ) {
+                        $query .= ' ORDER BY last_updated ';
+                } elseif ( $order_by == 'blogname' ) {
+                        $query .= ' ORDER BY domain ';
+                } else {
+                        $order_by = 'id';
+                        $query .= ' ORDER BY ' . $wpdb->blogs . '.blog_id ';
                 }
 
-                if ( $_GET['sortby'] == 'registered' ) {
-                        $query .= ' ORDER BY registered ';
-                } elseif ( $_GET['sortby'] == 'id' ) {
-                        $query .= ' ORDER BY ' . $wpdb->blogs . '.blog_id ';
-                } elseif ( $_GET['sortby'] == 'lastupdated' ) {
-                        $query .= ' ORDER BY last_updated ';
-                } elseif ( $_GET['sortby'] == 'blogname' ) {
-                        $query .= ' ORDER BY domain ';
-                }
-
-                $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
-
-                if ( !empty($s) ) {
+                $order = isset($_GET['order']) ? $_GET['order'] : 'ASC';
+                $order = ( 'DESC' == $order ) ? 'DESC' : 'ASC';
+                $query .= $order;
+
+                if ( !empty($s) )
                         $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(blog_id)', $query) );
-                } else {
+                else
                         $total = $wpdb->get_var( "SELECT COUNT(blog_id) FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ");
-                }
 
                 $query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num );
@@ -359 +359 @@
 
                 // Pagination
-                $url2 = "&order=" . $_GET['order'] . "&sortby=" . $_GET['sortby'] . "&s=";
-                if ( $_GET[ 'blog_ip' ] ) {
+                $url2 = "&order=" . $order . "&sortby=" . $order_by . "&s=";
+                if ( !empty($_GET[ 'blog_ip' ])  )
                         $url2 .= "&ip_address=" . urlencode( $s );
-                } else {
+                else
                         $url2 .= $s . "&ip_address=" . urlencode( $s );
-                }
+
                 $blog_navigation = paginate_links( array(
                         'base' => add_query_arg( 'apage', '%#%' ).$url2,
@@ -422 +422 @@
 
                 $sortby_url = "s=";
-                if ( $_GET[ 'blog_ip' ] ) {
+                if ( !empty($_GET[ 'blog_ip' ]) )
                         $sortby_url .= "&ip_address=" . urlencode( $s );
-                } else {
+                else
                         $sortby_url .= urlencode( $s ) . "&ip_address=" . urlencode( $s );
-                }
                 ?>
 
@@ -435 +434 @@
                                 <?php foreach($posts_columns as $column_id => $column_display_name) {
                                         $column_link = "<a href='ms-sites.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
-                                        if ( $_GET['sortby'] == $column_id ) {
-                                                $column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;';
+                                        if ( $order_by == $column_id ) {
+                                                $column_link .= ($order_by == 'DESC') ? 'order=ASC&amp;' : 'order=DESC&amp;';
                                         }
                                         $column_link .= "apage={$apage}'>{$column_display_name}</a>";

trunk/wp-includes/ms-functions.php

@@ -1 +1 @@
 <?php
-/*
-        Helper functions for WPMU
-*/
+/**
+ * Multi-site WordPress API
+ *
+ * @package WordPress
+ */
+
 function load_muplugin_textdomain($domain, $path = false) {
         $locale = get_locale();
@@ -126 +129 @@
                 $id = get_id_from_blogname( $id );
 
+        $id = (int) $id;
+
         $all = $getall == true ? '' : 'short';
         $details = wp_cache_get( $id . $all, 'blog-details' );
 
         if ( $details ) {
-                if ( $details == -1 )
+                if ( !is_object($details) && $details == -1 )
                         return false;
                 elseif ( !is_object($details) ) // Clear old pre-serialized objects. Cache clients do better with that.