Changeset 13376

Timestamp:

02/24/2010 06:58:52 PM (16 years ago)

Author:

nacin

Message:

More wpdb cleanups, see #12362

File:

• trunk/wp-includes/wp-db.php (modified) (11 diffs)

trunk/wp-includes/wp-db.php

@@ -569 +569 @@
         $this->prefix = $this->get_blog_prefix( $this->blogid );
 
-        foreach ( (array) $this->tables( 'blog' ) as $table => $prefixed_table )
+        foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
             $this->$table = $prefixed_table;
 
-        foreach ( (array) $this->tables( 'old' ) as $table => $prefixed_table )
+        foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
             $this->$table = $prefixed_table;
 
@@ -631 +631 @@
      * be determined by the prefix.
      *
+     * The scope argument can take one of the following:
+     *
+     * 'all' - returns 'all' and 'global' tables. No old tables are returned.
+     * 'global' - returns the global tables for the installation, returning multisite tables only if running multisite.
+     * 'ms_global' - returns the multisite global tables, regardless if current installation is multisite.
+     * 'blog' - returns the blog-level tables for the queried blog.
+     * 'old' - returns tables which are deprecated.
+     *
      * @since 3.0.0
      * @uses wpdb::$tables
@@ -638 +646 @@
      * @uses is_multisite()
      *
-     * @param string $scope Can be all, global, ms_global, blog, or old tables. Defaults to all.
-     *  'all' returns 'all' and 'global' tables. No old tables are returned.
-     *  'global' returns the global tables for the installation, returning multisite tables only if running multisite.
-     *  'ms_global' returns the multisite global tables, regardless if current installation is multisite.
-     *  'blog' returns the blog-level tables for the queried blog.
-     *  'old' returns tables which are deprecated.
-     * @param bool $prefix Whether to include table prefixes. Default true. If blog
+     * @param string $scope Optional. Can be all, global, ms_global, blog, or old tables. Defaults to all.
+     * @param bool $prefix Optional. Whether to include table prefixes. Default true. If blog
      *  prefix is requested, then the custom users and usermeta tables will be mapped.
-     * @param int $blog_id The blog_id to prefix. Defaults to wpdb::blogid. Used only when prefix is requested.
+     * @param int $blog_id Optional. The blog_id to prefix. Defaults to wpdb::blogid. Used only when prefix is requested.
      * @return array Table names. When a prefix is requested, the key is the unprefixed table name.
      */
     function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
         switch ( $scope ) {
-            case 'old' :
-                $tables = $this->old_tables;
-                break;
-            case 'blog' :
-                $tables = $this->tables;
-                break;
-            case 'ms_global' :
-                $tables = $this->ms_global_tables;
+            case 'all' :
+                $tables = array_merge( $this->global_tables, $this->tables );
+                if ( is_multisite() )
+                    $tables = array_merge( $tables, $this->ms_global_tables );
                 break;
             case 'global' :
@@ -665 +664 @@
                     $tables = array_merge( $tables, $this->ms_global_tables );
                 break;
-            case 'all' :
-                $tables = array_merge( $this->global_tables, $this->tables );
-                if ( is_multisite() )
-                    $tables = array_merge( $tables, $this->ms_global_tables );
+            case 'ms_global' :
+                $tables = $this->ms_global_tables;
+                break;
+            case 'blog' :
+                $tables = $this->tables;
+                break;
+            case 'old' :
+                $tables = $this->old_tables;
+                break;
+            default :
+                return array();
                 break;
         }
@@ -724 +730 @@
 
     /**
-     * Weak escape
-     *
-     * @uses addslashes()
+     * Weak escape, using addslashes()
+     *
+     * @see addslashes()
      * @since {@internal Version Unknown}}
      * @access private
@@ -738 +744 @@
 
     /**
-     * Real escape
-     *
-     * @uses mysql_real_escape_string()
-     * @uses addslashes()
+     * Real escape, using mysql_real_escape_string() or addslashes()
+     *
+     * @see mysql_real_escape_string()
+     * @see addslashes()
      * @since 2.8
      * @access private
@@ -787 +793 @@
      *
      * @since 0.71
-     * @param  string|array $data to escape
+     * @param string|array $data to escape
      * @return string|array escaped as query safe string
      */
@@ -810 +816 @@
      * @uses wpdb::_real_escape()
      * @since 2.3.0
-     * @param  string $string to escape
+     * @param string $string to escape
      * @return void
      */
@@ -1457 +1463 @@
      *
      * @param string $db_cap the feature
-     * @param false|string|resource $dbh_or_table. Not implemented.
      * @return bool
      */
@@ -1490 +1495 @@
             if ( isset( $call['class'] ) && __CLASS__ == $call['class'] )
                 continue; // Filter out wpdb calls.
-        }
-        $caller = join( ', ', $caller );
-
-        return $caller;
+            $caller[] = isset( $call['class'] ) ? "{$call['class']}->{$call['function']}" : $call['function'];
+        }
+
+        return join( ', ', $caller );
     }
 
@@ -1499 +1504 @@
      * The database version number.
      *
-     * @param false|string|resource $dbh_or_table. Not implemented.
      * @return false|string false on failure, version number on success
      */