Changeset 24121

Timestamp:

04/29/2013 12:31:56 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Remove extraneous function parameters in the wpdb class. props rlerdorf. see #24210.

File:

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

trunk/wp-includes/wp-db.php

@@ -641 +641 @@
      * @param string   $collate The collation (optional)
      */
-    function set_charset($dbh, $charset = null, $collate = null) {
-        if ( !isset($charset) )
+    function set_charset( $dbh, $charset = null, $collate = null ) {
+        if ( ! isset( $charset ) )
             $charset = $this->charset;
-        if ( !isset($collate) )
+        if ( ! isset( $collate ) )
             $collate = $this->collate;
-        if ( $this->has_cap( 'collation', $dbh ) && !empty( $charset ) ) {
-            if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset', $dbh ) ) {
+        if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) {
+            if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
                 mysql_set_charset( $charset, $dbh );
                 $this->real_escape = true;
@@ -1688 +1688 @@
 
     /**
-     * Determine if a database supports a particular feature
+     * Determine if a database supports a particular feature.
      *
      * @since 2.7.0
-     * @see   wpdb::db_version()
-     *
-     * @param string $db_cap the feature
+     * @see wpdb::db_version()
+     *
+     * @param string $db_cap The feature to check for.
      * @return bool
      */
@@ -1701 +1701 @@
         switch ( strtolower( $db_cap ) ) {
             case 'collation' :    // @since 2.5.0
-            case 'group_concat' : // @since 2.7
-            case 'subqueries' :   // @since 2.7
+            case 'group_concat' : // @since 2.7.0
+            case 'subqueries' :   // @since 2.7.0
                 return version_compare( $version, '4.1', '>=' );
             case 'set_charset' :
-                return version_compare($version, '5.0.7', '>=');
+                return version_compare( $version, '5.0.7', '>=' );
         };