' . htmlspecialchars( $this->dbuser, ENT_QUOTES ) . '',
+ '' . htmlspecialchars( $this->dbuser, ENT_QUOTES ) . '',
'' . htmlspecialchars( $db, ENT_QUOTES ) . ''
) . "username_%1$s. Could that be the problem?' ),
htmlspecialchars( $db, ENT_QUOTES )
- ). "\n";
+ ) . "\n";
$message .= "\n";
$message .= '' . sprintf( /* translators: %s: support forums URL */ __( 'If you don’t know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.' ), - __( 'https://wordpress.org/support/' ) + __( 'https://wordpress.org/support/forums/' ) ) . "
\n"; $this->bail( $message, 'db_select_fail' ); @@ -1081,8 +1150,9 @@ * @return string */ function _weak_escape( $string ) { - if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) + if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) { _deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' ); + } return addslashes( $string ); } @@ -1130,9 +1200,9 @@ if ( is_array( $data ) ) { foreach ( $data as $k => $v ) { if ( is_array( $v ) ) { - $data[$k] = $this->_escape( $v ); + $data[ $k ] = $this->_escape( $v ); } else { - $data[$k] = $this->_real_escape( $v ); + $data[ $k ] = $this->_real_escape( $v ); } } } else { @@ -1156,14 +1226,16 @@ * @return mixed */ public function escape( $data ) { - if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) + if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) { _deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' ); + } if ( is_array( $data ) ) { foreach ( $data as $k => $v ) { - if ( is_array( $v ) ) - $data[$k] = $this->escape( $v, 'recursive' ); - else - $data[$k] = $this->_weak_escape( $v, 'internal' ); + if ( is_array( $v ) ) { + $data[ $k ] = $this->escape( $v, 'recursive' ); + } else { + $data[ $k ] = $this->_weak_escape( $v, 'internal' ); + } } } else { $data = $this->_weak_escape( $data, 'internal' ); @@ -1182,8 +1254,9 @@ * @param string $string to escape */ public function escape_by_ref( &$string ) { - if ( ! is_float( $string ) ) + if ( ! is_float( $string ) ) { $string = $this->_real_escape( $string ); + } } /** @@ -1201,7 +1274,7 @@ * * Literal percentage signs (%) in the query string must be written as %%. Percentage wildcards (for example, * to use in LIKE syntax) must be passed via a substitution argument containing the complete LIKE string, these - * cannot be inserted directly in the query string. Also see {@see esc_like()}. + * cannot be inserted directly in the query string. Also see wpdb::esc_like(). * * Arguments may be passed as individual arguments to the method, or as a single array containing all arguments. A combination * of the two is not supported. @@ -1237,7 +1310,7 @@ $passed_as_array = false; if ( is_array( $args[0] ) && count( $args ) == 1 ) { $passed_as_array = true; - $args = $args[0]; + $args = $args[0]; } foreach ( $args as $arg ) { @@ -1262,14 +1335,14 @@ * If a %s placeholder already has quotes around it, removing the existing quotes and re-inserting them * ensures the quotes are consistent. * - * For backwards compatibility, this is only applied to %s, and not to placeholders like %1$s, which are frequently + * For backward compatibility, this is only applied to %s, and not to placeholders like %1$s, which are frequently * used in the middle of longer strings, or as table name placeholders. */ $query = str_replace( "'%s'", '%s', $query ); // Strip any existing single quotes. $query = str_replace( '"%s"', '%s', $query ); // Strip any existing double quotes. $query = preg_replace( '/(?use_mysqli ) { $str = mysqli_error( $this->dbh ); } else { $str = mysql_error( $this->dbh ); } } - $EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str ); - - if ( $this->suppress_errors ) + $EZSQL_ERROR[] = array( + 'query' => $this->last_query, + 'error_str' => $str, + ); + + if ( $this->suppress_errors ) { return false; + } wp_load_translations_early(); @@ -1369,8 +1449,9 @@ error_log( $error_str ); // Are we showing errors? - if ( ! $this->show_errors ) + if ( ! $this->show_errors ) { return false; + } // If there is an error then take note of it if ( is_multisite() ) { @@ -1415,7 +1496,7 @@ * @return bool Old value for showing errors. */ public function show_errors( $show = true ) { - $errors = $this->show_errors; + $errors = $this->show_errors; $this->show_errors = $show; return $errors; } @@ -1431,7 +1512,7 @@ * @return bool Whether showing of errors was active */ public function hide_errors() { - $show = $this->show_errors; + $show = $this->show_errors; $this->show_errors = false; return $show; } @@ -1448,7 +1529,7 @@ * @return bool Old value */ public function suppress_errors( $suppress = true ) { - $errors = $this->suppress_errors; + $errors = $this->suppress_errors; $this->suppress_errors = (bool) $suppress; return $errors; } @@ -1459,18 +1540,18 @@ * @since 0.71 */ public function flush() { - $this->last_result = array(); - $this->col_info = null; - $this->last_query = null; + $this->last_result = array(); + $this->col_info = null; + $this->last_query = null; $this->rows_affected = $this->num_rows = 0; - $this->last_error = ''; + $this->last_error = ''; if ( $this->use_mysqli && $this->result instanceof mysqli_result ) { mysqli_free_result( $this->result ); $this->result = null; // Sanity check before using the handle - if ( empty( $this->dbh ) || !( $this->dbh instanceof mysqli ) ) { + if ( empty( $this->dbh ) || ! ( $this->dbh instanceof mysqli ) ) { return; } @@ -1502,7 +1583,7 @@ * Deprecated in 3.9+ when using MySQLi. No equivalent * $new_link parameter exists for mysqli_* functions. */ - $new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true; + $new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true; $client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0; if ( $this->use_mysqli ) { @@ -1538,10 +1619,10 @@ /* * It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if: - * - We haven't previously connected, and - * - WP_USE_EXT_MYSQL isn't set to false, and - * - ext/mysql is loaded. - */ + * - We haven't previously connected, and + * - WP_USE_EXT_MYSQL isn't set to false, and + * - ext/mysql is loaded. + */ $attempt_fallback = true; if ( $this->has_connected ) { @@ -1577,7 +1658,7 @@ $message = '' . sprintf(
- /* translators: 1: wp-config.php. 2: database host */
+ /* translators: 1: wp-config.php, 2: database host */
__( 'This either means that the username and password information in your %1$s file is incorrect or we can’t contact the database server at %2$s. This could mean your host’s database server is down.' ),
'wp-config.php',
'' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . ''
@@ -1592,7 +1673,7 @@
$message .= '
' . sprintf( /* translators: %s: support forums URL */ __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), - __( 'https://wordpress.org/support/' ) + __( 'https://wordpress.org/support/forums/' ) ) . "
\n"; $this->bail( $message, 'db_connect_fail' ); @@ -1640,7 +1721,7 @@ $socket_pos = strpos( $host, ':/' ); if ( $socket_pos !== false ) { $socket = substr( $host, $socket_pos + 1 ); - $host = substr( $host, 0, $socket_pos ); + $host = substr( $host, 0, $socket_pos ); } // We need to check for an IPv6 address first. @@ -1654,7 +1735,7 @@ } $matches = array(); - $result = preg_match( $pattern, $host, $matches ); + $result = preg_match( $pattern, $host, $matches ); if ( 1 !== $result ) { // Couldn't parse the address, bail. @@ -1750,7 +1831,7 @@ $message .= '' . sprintf( /* translators: %s: support forums URL */ __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.' ), - __( 'https://wordpress.org/support/' ) + __( 'https://wordpress.org/support/forums/' ) ) . "
\n"; // We weren't able to reconnect, so we better bail. @@ -1768,7 +1849,8 @@ * @since 0.71 * * @param string $query Database query - * @return int|false Number of rows affected/selected or false on error + * @return int|bool Boolean true for CREATE, ALTER, TRUNCATE and DROP queries. Number of rows + * affected/selected for all other queries. Boolean false on error. */ public function query( $query ) { if ( ! $this->ready ) { @@ -1858,8 +1940,9 @@ if ( $this->last_error ) { // Clear insert_id on a subsequent failed insert. - if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) ) + if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) ) { $this->insert_id = 0; + } $this->print_error(); return false; @@ -1887,12 +1970,12 @@ $num_rows = 0; if ( $this->use_mysqli && $this->result instanceof mysqli_result ) { while ( $row = mysqli_fetch_object( $this->result ) ) { - $this->last_result[$num_rows] = $row; + $this->last_result[ $num_rows ] = $row; $num_rows++; } } elseif ( is_resource( $this->result ) ) { while ( $row = mysql_fetch_object( $this->result ) ) { - $this->last_result[$num_rows] = $row; + $this->last_result[ $num_rows ] = $row; $num_rows++; } } @@ -1928,7 +2011,12 @@ $this->num_queries++; if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) { - $this->queries[] = array( $query, $this->timer_stop(), $this->get_caller() ); + $this->queries[] = array( + $query, + $this->timer_stop(), + $this->get_caller(), + $this->time_start, + ); } } @@ -1953,7 +2041,7 @@ /* * Add the filter to remove the placeholder escaper. Uses priority 0, so that anything - * else attached to this filter will recieve the query with the placeholder string removed. + * else attached to this filter will receive the query with the placeholder string removed. */ if ( ! has_filter( 'query', array( $this, 'remove_placeholder_escape' ) ) ) { add_filter( 'query', array( $this, 'remove_placeholder_escape' ), 0 ); @@ -2154,10 +2242,10 @@ } $conditions[] = "`$field` = " . $value['format']; - $values[] = $value['value']; + $values[] = $value['value']; } - $fields = implode( ', ', $fields ); + $fields = implode( ', ', $fields ); $conditions = implode( ' AND ', $conditions ); $sql = "UPDATE `$table` SET $fields WHERE $conditions"; @@ -2206,7 +2294,7 @@ } $conditions[] = "`$field` = " . $value['format']; - $values[] = $value['value']; + $values[] = $value['value']; } $conditions = implode( ' AND ', $conditions ); @@ -2381,12 +2469,12 @@ } // Extract var out of cached results based x,y vals - if ( !empty( $this->last_result[$y] ) ) { - $values = array_values( get_object_vars( $this->last_result[$y] ) ); + if ( ! empty( $this->last_result[ $y ] ) ) { + $values = array_values( get_object_vars( $this->last_result[ $y ] ) ); } // If there is a value return it else return null - return ( isset( $values[$x] ) && $values[$x] !== '' ) ? $values[$x] : null; + return ( isset( $values[ $x ] ) && $values[ $x ] !== '' ) ? $values[ $x ] : null; } /** @@ -2415,20 +2503,21 @@ return null; } - if ( !isset( $this->last_result[$y] ) ) + if ( ! isset( $this->last_result[ $y ] ) ) { return null; + } if ( $output == OBJECT ) { - return $this->last_result[$y] ? $this->last_result[$y] : null; + return $this->last_result[ $y ] ? $this->last_result[ $y ] : null; } elseif ( $output == ARRAY_A ) { - return $this->last_result[$y] ? get_object_vars( $this->last_result[$y] ) : null; + return $this->last_result[ $y ] ? get_object_vars( $this->last_result[ $y ] ) : null; } elseif ( $output == ARRAY_N ) { - return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null; + return $this->last_result[ $y ] ? array_values( get_object_vars( $this->last_result[ $y ] ) ) : null; } elseif ( strtoupper( $output ) === OBJECT ) { // Back compat for OBJECT being previously case insensitive. - return $this->last_result[$y] ? $this->last_result[$y] : null; + return $this->last_result[ $y ] ? $this->last_result[ $y ] : null; } else { - $this->print_error( " \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N" ); + $this->print_error( ' $db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N' ); } } @@ -2445,7 +2534,7 @@ * @param int $x Optional. Column to return. Indexed from 0. * @return array Database query result. Array indexed from 0 by SQL result row number. */ - public function get_col( $query = null , $x = 0 ) { + public function get_col( $query = null, $x = 0 ) { if ( $this->check_current_query && $this->check_safe_collation( $query ) ) { $this->check_current_query = false; } @@ -2456,8 +2545,10 @@ $new_array = array(); // Extract the column values - for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) { - $new_array[$i] = $this->get_var( null, $x, $i ); + if ( $this->last_result ) { + for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) { + $new_array[ $i ] = $this->get_var( null, $x, $i ); + } } return $new_array; } @@ -2497,11 +2588,14 @@ } elseif ( $output == OBJECT_K ) { // Return an array of row objects with keys from column 1 // (Duplicates are discarded) - foreach ( $this->last_result as $row ) { - $var_by_ref = get_object_vars( $row ); - $key = array_shift( $var_by_ref ); - if ( ! isset( $new_array[ $key ] ) ) - $new_array[ $key ] = $row; + if ( $this->last_result ) { + foreach ( $this->last_result as $row ) { + $var_by_ref = get_object_vars( $row ); + $key = array_shift( $var_by_ref ); + if ( ! isset( $new_array[ $key ] ) ) { + $new_array[ $key ] = $row; + } + } } return $new_array; } elseif ( $output == ARRAY_A || $output == ARRAY_N ) { @@ -2559,8 +2653,8 @@ $charsets = $columns = array(); $table_parts = explode( '.', $table ); - $table = '`' . implode( '`.`', $table_parts ) . '`'; - $results = $this->get_results( "SHOW FULL COLUMNS FROM $table" ); + $table = '`' . implode( '`.`', $table_parts ) . '`'; + $results = $this->get_results( "SHOW FULL COLUMNS FROM $table" ); if ( ! $results ) { return new WP_Error( 'wpdb_get_table_charset_failure' ); } @@ -2636,7 +2730,7 @@ * character set. WP_Error object if there was an error. */ public function get_col_charset( $table, $column ) { - $tablekey = strtolower( $table ); + $tablekey = strtolower( $table ); $columnkey = strtolower( $column ); /** @@ -2701,7 +2795,7 @@ * WP_Error object if there was an error. */ public function get_col_length( $table, $column ) { - $tablekey = strtolower( $table ); + $tablekey = strtolower( $table ); $columnkey = strtolower( $column ); // Skip this entirely if this isn't a MySQL database. @@ -2730,7 +2824,7 @@ $length = false; } - switch( $type ) { + switch ( $type ) { case 'char': case 'varchar': return array( @@ -2831,7 +2925,7 @@ } $this->checking_collation = true; - $collation = $this->get_table_charset( $table ); + $collation = $this->get_table_charset( $table ); $this->checking_collation = false; // Tables with no collation, or latin1 only, don't need extra checking. @@ -2878,7 +2972,7 @@ $charset = $value['charset']; if ( is_array( $value['length'] ) ) { - $length = $value['length']['length']; + $length = $value['length']['length']; $truncate_by_byte_length = 'byte' === $value['length']['type']; } else { $length = false; @@ -2907,7 +3001,7 @@ ( ! isset( $value['ascii'] ) && $this->check_ascii( $value['value'] ) ) ) { $truncate_by_byte_length = true; - $needs_validation = false; + $needs_validation = false; } if ( $truncate_by_byte_length ) { @@ -2941,13 +3035,12 @@ '; } - $regex .= '){1,40} # ...one or more times + $regex .= '){1,40} # ...one or more times ) | . # anything else /x'; $value['value'] = preg_replace( $regex, '$1', $value['value'] ); - if ( false !== $length && mb_strlen( $value['value'], 'UTF-8' ) > $length ) { $value['value'] = mb_substr( $value['value'], 0, $length, 'UTF-8' ); } @@ -2982,9 +3075,9 @@ } if ( is_array( $value['length'] ) ) { - $length = sprintf( '%.0f', $value['length']['length'] ); + $length = sprintf( '%.0f', $value['length']['length'] ); $queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), $length ) USING $connection_charset )", $value['value'] ); - } else if ( 'binary' !== $charset ) { + } elseif ( 'binary' !== $charset ) { // If we don't have a length, there's no need to convert binary - it will always return the same result. $queries[ $col ] = $this->prepare( "CONVERT( CONVERT( %s USING $charset ) USING $connection_charset )", $value['value'] ); } @@ -3003,14 +3096,14 @@ } $this->check_current_query = false; - $row = $this->get_row( "SELECT " . implode( ', ', $sql ), ARRAY_A ); + $row = $this->get_row( 'SELECT ' . implode( ', ', $sql ), ARRAY_A ); if ( ! $row ) { return new WP_Error( 'wpdb_strip_invalid_text_failure' ); } foreach ( array_keys( $data ) as $column ) { - if ( isset( $row["x_$column"] ) ) { - $data[ $column ]['value'] = $row["x_$column"]; + if ( isset( $row[ "x_$column" ] ) ) { + $data[ $column ]['value'] = $row[ "x_$column" ]; } } } @@ -3092,7 +3185,7 @@ 'value' => $value, 'charset' => $charset, 'length' => $this->get_col_length( $table, $column ), - ) + ), ); $data = $this->strip_invalid_text( $data ); @@ -3122,13 +3215,17 @@ $query = preg_replace( '/\((?!\s*select)[^(]*?\)/is', '()', $query ); // Quickly match most common queries. - if ( preg_match( '/^\s*(?:' + if ( preg_match( + '/^\s*(?:' . 'SELECT.*?\s+FROM' . '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?' . '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?' . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?' . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:.+?FROM)?' - . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) { + . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', + $query, + $maybe + ) ) { return str_replace( '`', '', $maybe[1] ); } @@ -3147,7 +3244,8 @@ } // Big pattern for the rest of the table-related queries. - if ( preg_match( '/^\s*(?:' + if ( preg_match( + '/^\s*(?:' . '(?:EXPLAIN\s+(?:EXTENDED\s+)?)?SELECT.*?\s+FROM' . '|DESCRIBE|DESC|EXPLAIN|HANDLER' . '|(?:LOCK|UNLOCK)\s+TABLE(?:S)?' @@ -3161,7 +3259,10 @@ . '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE' . '|(?:GRANT|REVOKE).*ON\s+TABLE' . '|SHOW\s+(?:.*FROM|.*TABLE)' - . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) { + . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', + $query, + $maybe + ) ) { return str_replace( '`', '', $maybe[1] ); } @@ -3172,11 +3273,11 @@ * Load the column metadata from the last query. * * @since 3.5.0 - * */ protected function load_col_info() { - if ( $this->col_info ) + if ( $this->col_info ) { return; + } if ( $this->use_mysqli ) { $num_fields = mysqli_num_fields( $this->result ); @@ -3205,15 +3306,15 @@ if ( $this->col_info ) { if ( $col_offset == -1 ) { - $i = 0; + $i = 0; $new_array = array(); foreach ( (array) $this->col_info as $col ) { - $new_array[$i] = $col->{$info_type}; + $new_array[ $i ] = $col->{$info_type}; $i++; } return $new_array; } else { - return $this->col_info[$col_offset]->{$info_type}; + return $this->col_info[ $col_offset ]->{$info_type}; } } } @@ -3253,15 +3354,37 @@ * @return false|void */ public function bail( $message, $error_code = '500' ) { - if ( !$this->show_errors ) { + if ( $this->show_errors ) { + $error = ''; + + if ( $this->use_mysqli ) { + if ( $this->dbh instanceof mysqli ) { + $error = mysqli_error( $this->dbh ); + } elseif ( mysqli_connect_errno() ) { + $error = mysqli_connect_error(); + } + } else { + if ( is_resource( $this->dbh ) ) { + $error = mysql_error( $this->dbh ); + } else { + $error = mysql_error(); + } + } + + if ( $error ) { + $message = '' . $error . "