Changeset 13426

Timestamp:

02/26/2010 06:14:26 AM (16 years ago)

Author:

nacin

Message:

@since version numbers and other docs for wp-db. props hakre see #12362

File:

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

trunk/wp-includes/wp-db.php

@@ -21 +21 @@
 
 /**
- * @since {@internal Version Unknown}}
+ * @since 2.5.0
  */
 define( 'OBJECT_K', 'OBJECT_K', false );
@@ -120 +120 @@
      * Results of the last query made
      *
-     * @since {@internal Version Unknown}}
+     * @since 1.0.0
      * @access private
      * @var array|null
@@ -187 +187 @@
      * List of WordPress per-blog tables
      *
-     * @since {@internal Version Unknown}}
+     * @since 2.5.0
      * @access private
      * @see wpdb::tables()
@@ -267 +267 @@
      * WordPress Post Metadata table
      *
-     * @since {@internal Version Unknown}}
+     * @since 1.5.0
      * @access public
      * @var string
@@ -471 +471 @@
      * to the database.
      *
+     * @link http://core.trac.wordpress.org/ticket/3354
      * @since 2.0.8
      *
@@ -534 +535 @@
      * PHP5 style destructor and will run when database object is destroyed.
      *
+     * @see wpdb::__construct()
      * @since 2.0.8
      * @return bool true
@@ -635 +637 @@
      *
      * 'all' - returns 'all' and 'global' tables. No old tables are returned.
+     * 'blog' - returns the blog-level tables for the queried blog.
      * '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.
      *
@@ -650 +652 @@
      * @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 Optional. 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.
      */
@@ -659 +661 @@
                 if ( is_multisite() )
                     $tables = array_merge( $tables, $this->ms_global_tables );
+                break;
+            case 'blog' :
+                $tables = $this->tables;
                 break;
             case 'global' :
@@ -667 +672 @@
             case 'ms_global' :
                 $tables = $this->ms_global_tables;
-                break;
-            case 'blog' :
-                $tables = $this->tables;
                 break;
             case 'old' :
@@ -734 +736 @@
      *
      * @see addslashes()
-     * @since {@internal Version Unknown}}
-     * @access private
-     *
-     * @param  string $string
+     * @since 2.8.0
+     * @access private
+     *
+     * @param string $string
      * @return string
      */
@@ -872 +874 @@
         $query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
         $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
-        $query = preg_replace('|(?<!%)%s|', "'%s'", $query); // quote the strings, avoiding escaped strings like %%s
+        $query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
         array_walk( $args, array( &$this, 'escape_by_ref' ) );
         return @vsprintf( $query, $args );
@@ -897 +899 @@
 
         if ( $caller = $this->get_caller() )
-            $error_str = sprintf(/*WP_I18N_DB_QUERY_ERROR_FULL*/'WordPress database error %1$s for query %2$s made by %3$s'/*/WP_I18N_DB_QUERY_ERROR_FULL*/, $str, $this->last_query, $caller);
+            $error_str = sprintf( /*WP_I18N_DB_QUERY_ERROR_FULL*/'WordPress database error %1$s for query %2$s made by %3$s'/*/WP_I18N_DB_QUERY_ERROR_FULL*/, $str, $this->last_query, $caller );
         else
-            $error_str = sprintf(/*WP_I18N_DB_QUERY_ERROR*/'WordPress database error %1$s for query %2$s'/*/WP_I18N_DB_QUERY_ERROR*/, $str, $this->last_query);
-
-        if ( function_exists('error_log') && $log_file = @ini_get('error_log') && ( 'syslog' == $log_file || is_writable( $log_file ) ) )
-            @error_log( $error_str, 0 );
-
-        // Is error output turned on or not..
+            $error_str = sprintf( /*WP_I18N_DB_QUERY_ERROR*/'WordPress database error %1$s for query %2$s'/*/WP_I18N_DB_QUERY_ERROR*/, $str, $this->last_query );
+
+        if ( function_exists( 'error_log' )
+            && $log_file = @ini_get( 'error_log' )
+            && ( 'syslog' == $log_file || @is_writable( $log_file ) )
+            )
+            @error_log( $error_str );
+
+        // Are we showing errors?
         if ( ! $this->show_errors )
             return false;