mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-16 23:00:21 +00:00
Death to trailing tabs. Props Mark J. fixes #2405
git-svn-id: https://develop.svn.wordpress.org/trunk@3517 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
+13
-13
@@ -16,7 +16,7 @@ if (!defined('SAVEQUERIES'))
|
||||
class wpdb {
|
||||
|
||||
var $show_errors = true;
|
||||
var $num_queries = 0;
|
||||
var $num_queries = 0;
|
||||
var $last_query;
|
||||
var $col_info;
|
||||
var $queries;
|
||||
@@ -75,7 +75,7 @@ class wpdb {
|
||||
|
||||
// ====================================================================
|
||||
// Format a string correctly for safe insert under all PHP conditions
|
||||
|
||||
|
||||
function escape($string) {
|
||||
return addslashes( $string ); // Disable rest for now, causing problems
|
||||
if( !$this->dbh || version_compare( phpversion(), '4.3.0' ) == '-1' )
|
||||
@@ -101,7 +101,7 @@ class wpdb {
|
||||
<code>$this->last_query</code></p>
|
||||
</div>";
|
||||
} else {
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ class wpdb {
|
||||
function show_errors() {
|
||||
$this->show_errors = true;
|
||||
}
|
||||
|
||||
|
||||
function hide_errors() {
|
||||
$this->show_errors = false;
|
||||
}
|
||||
@@ -142,7 +142,7 @@ class wpdb {
|
||||
// Perform the query via std mysql_query function..
|
||||
if (SAVEQUERIES)
|
||||
$this->timer_start();
|
||||
|
||||
|
||||
$this->result = @mysql_query($query, $this->dbh);
|
||||
++$this->num_queries;
|
||||
|
||||
@@ -159,7 +159,7 @@ class wpdb {
|
||||
$this->rows_affected = mysql_affected_rows();
|
||||
// Take note of the insert_id
|
||||
if ( preg_match("/^\\s*(insert|replace) /i",$query) ) {
|
||||
$this->insert_id = mysql_insert_id($this->dbh);
|
||||
$this->insert_id = mysql_insert_id($this->dbh);
|
||||
}
|
||||
// Return number of rows affected
|
||||
$return_val = $this->rows_affected;
|
||||
@@ -179,7 +179,7 @@ class wpdb {
|
||||
|
||||
// Log number of rows the query returned
|
||||
$this->num_rows = $num_rows;
|
||||
|
||||
|
||||
// Return number of rows selected
|
||||
$return_val = $this->num_rows;
|
||||
}
|
||||
@@ -293,7 +293,7 @@ class wpdb {
|
||||
$this->time_start = $mtime[1] + $mtime[0];
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
function timer_stop($precision = 3) {
|
||||
$mtime = microtime();
|
||||
$mtime = explode(' ', $mtime);
|
||||
@@ -305,7 +305,7 @@ class wpdb {
|
||||
function bail($message) { // Just wraps errors in a nice header and footer
|
||||
if ( !$this->show_errors )
|
||||
return false;
|
||||
header( 'Content-Type: text/html; charset=utf-8');
|
||||
header( 'Content-Type: text/html; charset=utf-8');
|
||||
echo <<<HEAD
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
@@ -325,22 +325,22 @@ class wpdb {
|
||||
margin-right: 25%;
|
||||
padding: .2em 2em;
|
||||
}
|
||||
|
||||
|
||||
h1 {
|
||||
color: #006;
|
||||
font-size: 18px;
|
||||
font-weight: lighter;
|
||||
}
|
||||
|
||||
|
||||
h2 {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
|
||||
p, li, dt {
|
||||
line-height: 140%;
|
||||
padding-bottom: 2px;
|
||||
}
|
||||
|
||||
|
||||
ul, ol {
|
||||
padding: 5px 5px 5px 20px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user