Ticket #21663: 21663.6.diff
File 21663.6.diff, 7.8 KB (added by , 11 years ago) |
---|
-
src/wp-includes/wp-db.php
510 510 public $is_mysql = null; 511 511 512 512 /** 513 * Whether to use mysqli over mysql. 514 * 515 * @since 3.8.0 516 * @access private 517 * @var bool 518 */ 519 private $use_mysqli = false; 520 521 /** 513 522 * Connects to the database server and selects a database 514 523 * 515 524 * PHP5 style constructor for compatibility with PHP5. Does … … 530 539 if ( WP_DEBUG && WP_DEBUG_DISPLAY ) 531 540 $this->show_errors(); 532 541 542 $this->use_mysqli = ( version_compare( phpversion(), '5.5', '>=' ) && function_exists( 'mysqli_connect' ) ); 543 533 544 $this->init_charset(); 534 545 535 546 $this->dbuser = $dbuser; … … 637 648 if ( ! isset( $collate ) ) 638 649 $collate = $this->collate; 639 650 if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) { 640 if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' )) {641 mysql_set_charset( $charset, $dbh);651 if ( $this->use_mysqli ) { 652 mysqli_set_charset( $dbh, $charset ); 642 653 } else { 643 $query = $this->prepare( 'SET NAMES %s', $charset ); 644 if ( ! empty( $collate ) ) 645 $query .= $this->prepare( ' COLLATE %s', $collate ); 646 mysql_query( $query, $dbh ); 654 if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) { 655 mysql_set_charset( $charset, $dbh ); 656 } else { 657 $query = $this->prepare( 'SET NAMES %s', $charset ); 658 if ( ! empty( $collate ) ) 659 $query .= $this->prepare( ' COLLATE %s', $collate ); 660 mysql_query( $query, $dbh ); 661 } 647 662 } 648 663 } 649 664 } … … 830 845 if ( is_null($dbh) ) 831 846 $dbh = $this->dbh; 832 847 833 if ( !@mysql_select_db( $db, $dbh ) ) { 848 if ( $this->use_mysqli ) { 849 $success = @mysqli_select_db( $dbh, $db ); 850 } else { 851 $success = @mysql_select_db( $db, $dbh ); 852 } 853 if ( ! $success ) { 834 854 $this->ready = false; 835 855 wp_load_translations_early(); 836 856 $this->bail( sprintf( __( '<h1>Can’t select database</h1> … … 866 886 } 867 887 868 888 /** 869 * Real escape, using mysql _real_escape_string()889 * Real escape, using mysqli_real_escape_string() or mysql_real_escape_string() 870 890 * 891 * @see mysqli_real_escape_string() 871 892 * @see mysql_real_escape_string() 872 893 * @since 2.8.0 873 894 * @access private … … 876 897 * @return string escaped 877 898 */ 878 899 function _real_escape( $string ) { 879 if ( $this->dbh ) 880 return mysql_real_escape_string( $string, $this->dbh ); 900 if ( $this->dbh ) { 901 if ( $this->use_mysqli ) { 902 return mysqli_real_escape_string( $this->dbh, $string ); 903 } else { 904 return mysql_real_escape_string( $string, $this->dbh ); 905 } 906 } 881 907 882 908 $class = get_class( $this ); 883 909 _doing_it_wrong( $class, "$class must set a database connection for use with escaping.", E_USER_NOTICE ); … … 1018 1044 function print_error( $str = '' ) { 1019 1045 global $EZSQL_ERROR; 1020 1046 1021 if ( !$str ) 1022 $str = mysql_error( $this->dbh ); 1047 if ( !$str ) { 1048 if ( $this->use_mysqli ) { 1049 $str = mysqli_error( $this->dbh ); 1050 } else { 1051 $str = mysql_error( $this->dbh ); 1052 } 1053 } 1023 1054 $EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str ); 1024 1055 1025 1056 if ( $this->suppress_errors ) … … 1122 1153 $this->rows_affected = $this->num_rows = 0; 1123 1154 $this->last_error = ''; 1124 1155 1125 if ( is_resource( $this->result ) ) 1126 mysql_free_result( $this->result ); 1156 if ( is_resource( $this->result ) ) { 1157 if ( $this->use_mysqli ) { 1158 mysqli_free_result( $this->result ); 1159 } else { 1160 mysql_free_result( $this->result ); 1161 } 1162 } 1127 1163 } 1128 1164 1129 1165 /** … … 1138 1174 $new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true; 1139 1175 $client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0; 1140 1176 1141 if ( WP_DEBUG ) { 1142 $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags ); 1177 if ( $this->use_mysqli ) { 1178 $this->dbh = mysqli_init(); 1179 if ( WP_DEBUG ) { 1180 mysqli_real_connect( $this->dbh, $this->dbhost, $this->dbuser, $this->dbpassword, null, null, null, $client_flags ); 1181 } else { 1182 @mysqli_real_connect( $this->dbh, $this->dbhost, $this->dbuser, $this->dbpassword, null, null, null, $client_flags ); 1183 } 1143 1184 } else { 1144 $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags ); 1185 if ( WP_DEBUG ) { 1186 $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags ); 1187 } else { 1188 $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags ); 1189 } 1145 1190 } 1146 1191 1147 1192 if ( !$this->dbh ) { … … 1202 1247 if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) 1203 1248 $this->timer_start(); 1204 1249 1205 $this->result = @mysql_query( $query, $this->dbh ); 1250 if ( $this->use_mysqli ) { 1251 $this->result = @mysqli_query( $this->dbh, $query ); 1252 } else { 1253 $this->result = @mysql_query( $query, $this->dbh ); 1254 } 1206 1255 $this->num_queries++; 1207 1256 1208 1257 if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) 1209 1258 $this->queries[] = array( $query, $this->timer_stop(), $this->get_caller() ); 1210 1259 1211 1260 // If there is an error then take note of it.. 1212 if ( $this->last_error = mysql_error( $this->dbh ) ) { 1261 if ( $this->use_mysqli ) { 1262 $this->last_error = mysqli_error( $this->dbh ); 1263 } else { 1264 $this->last_error = mysql_error( $this->dbh ); 1265 } 1266 1267 if ( $this->last_error ) { 1213 1268 // Clear insert_id on a subsequent failed insert. 1214 1269 if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) ) 1215 1270 $this->insert_id = 0; … … 1221 1276 if ( preg_match( '/^\s*(create|alter|truncate|drop)\s/i', $query ) ) { 1222 1277 $return_val = $this->result; 1223 1278 } elseif ( preg_match( '/^\s*(insert|delete|update|replace)\s/i', $query ) ) { 1224 $this->rows_affected = mysql_affected_rows( $this->dbh ); 1279 if ( $this->use_mysqli ) { 1280 $this->rows_affected = mysqli_affected_rows( $this->dbh ); 1281 } else { 1282 $this->rows_affected = mysql_affected_rows( $this->dbh ); 1283 } 1225 1284 // Take note of the insert_id 1226 1285 if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) { 1227 $this->insert_id = mysql_insert_id($this->dbh); 1286 if ( $this->use_mysqli ) { 1287 $this->insert_id = mysqli_insert_id( $this->dbh ); 1288 } else { 1289 $this->insert_id = mysql_insert_id( $this->dbh ); 1290 } 1228 1291 } 1229 1292 // Return number of rows affected 1230 1293 $return_val = $this->rows_affected; 1231 1294 } else { 1232 1295 $num_rows = 0; 1233 while ( $row = @mysql_fetch_object( $this->result ) ) { 1234 $this->last_result[$num_rows] = $row; 1235 $num_rows++; 1296 if ( $this->use_mysqli ) { 1297 while ( $row = @mysqli_fetch_object( $this->result ) ) { 1298 $this->last_result[$num_rows] = $row; 1299 $num_rows++; 1300 } 1301 } else { 1302 while ( $row = @mysql_fetch_object( $this->result ) ) { 1303 $this->last_result[$num_rows] = $row; 1304 $num_rows++; 1305 } 1236 1306 } 1237 1307 1238 1308 // Log number of rows the query returned … … 1574 1644 if ( $this->col_info ) 1575 1645 return; 1576 1646 1577 for ( $i = 0; $i < @mysql_num_fields( $this->result ); $i++ ) { 1578 $this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i ); 1647 if ( $this->use_mysqli ) { 1648 for ( $i = 0; $i < @mysqli_num_fields( $this->result ); $i++ ) { 1649 $this->col_info[ $i ] = @mysqli_fetch_field( $this->result, $i ); 1650 } 1651 } else { 1652 for ( $i = 0; $i < @mysql_num_fields( $this->result ); $i++ ) { 1653 $this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i ); 1654 } 1579 1655 } 1580 1656 } 1581 1657 … … 1747 1823 * @return false|string false on failure, version number on success 1748 1824 */ 1749 1825 function db_version() { 1750 return preg_replace( '/[^0-9.].*/', '', mysql_get_server_info( $this->dbh ) ); 1826 if ( $this->use_mysqli ) { 1827 $server_info = mysqli_get_server_info( $this->dbh ); 1828 } else { 1829 $server_info = mysql_get_server_info( $this->dbh ); 1830 } 1831 return preg_replace( '/[^0-9.].*/', '', $server_info ); 1751 1832 } 1752 1833 }