diff --git wp-includes/wp-db.php wp-includes/wp-db.php
index 76f766a..013cfb0 100644
|
|
class wpdb { |
521 | 521 | * @since 3.1.0 |
522 | 522 | */ |
523 | 523 | function init_charset() { |
524 | | if ( function_exists('is_multisite') && is_multisite() ) { |
| 524 | if ( is_multisite() ) { |
525 | 525 | $this->charset = 'utf8'; |
526 | 526 | if ( defined( 'DB_COLLATE' ) && DB_COLLATE ) |
527 | 527 | $this->collate = DB_COLLATE; |
… |
… |
class wpdb { |
550 | 550 | if ( !isset($collate) ) |
551 | 551 | $collate = $this->collate; |
552 | 552 | if ( $this->has_cap( 'collation', $dbh ) && !empty( $charset ) ) { |
553 | | if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset', $dbh ) ) { |
| 553 | if ( $this->has_cap( 'set_charset', $dbh ) ) { |
554 | 554 | mysql_set_charset( $charset, $dbh ); |
555 | 555 | $this->real_escape = true; |
556 | 556 | } else { |
… |
… |
class wpdb { |
902 | 902 | $args = $args[0]; |
903 | 903 | $query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it |
904 | 904 | $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting |
905 | | $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware |
| 905 | $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware |
906 | 906 | $query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s |
907 | 907 | array_walk( $args, array( &$this, 'escape_by_ref' ) ); |
908 | 908 | return @vsprintf( $query, $args ); |
… |
… |
class wpdb { |
934 | 934 | else |
935 | 935 | $error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query ); |
936 | 936 | |
937 | | if ( function_exists( 'error_log' ) |
938 | | && ( $log_file = @ini_get( 'error_log' ) ) |
939 | | && ( 'syslog' == $log_file || @is_writable( $log_file ) ) |
940 | | ) |
| 937 | $log_file = @ini_get( 'error_log' ); |
| 938 | if ( 'syslog' == $log_file || @is_writable( $log_file ) ) |
941 | 939 | @error_log( $error_str ); |
942 | 940 | |
943 | 941 | // Are we showing errors? |
… |
… |
class wpdb { |
1518 | 1516 | */ |
1519 | 1517 | function bail( $message, $error_code = '500' ) { |
1520 | 1518 | if ( !$this->show_errors ) { |
1521 | | if ( class_exists( 'WP_Error' ) ) |
1522 | | $this->error = new WP_Error($error_code, $message); |
1523 | | else |
1524 | | $this->error = $message; |
| 1519 | $this->error = new WP_Error($error_code, $message); |
1525 | 1520 | return false; |
1526 | 1521 | } |
1527 | 1522 | wp_die($message); |