Skip to content

Tenzing / Tz Tools

Go to a project
Toggle navigation
Toggle navigation pinning
6e5c8f77 by Marty Penner
Options

Merge branch 'wp4' into v0.5 

* wp4:
  Fix a query failing in UserSearch
  Change hrefs for notices so the user doesn't accidentally navigate away
  Fix a few incorrectly-merged mysql queries
2 parents e99567d8 bf6c87e2
Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
......@@ -32,7 +32,7 @@ class UserSearch implements ArrayAccess, Iterator, Countable {
protected $count = 0;
protected $num_rows = 0;
protected $fields = Array();
protected $fields = [];
protected $userclass = 'User';
......@@ -91,7 +91,7 @@ class UserSearch implements ArrayAccess, Iterator, Countable {
}
}
mysql_query("SET SESSION group_concat_max_len = 40960", $wpdb->dbh);
mysqli_query($wpdb->dbh, "SET SESSION group_concat_max_len = 40960");
$query = "
SELECT SQL_CALC_FOUND_ROWS
......@@ -119,11 +119,11 @@ class UserSearch implements ArrayAccess, Iterator, Countable {
{$limit_clause}
";
$this->result = mysql_query($query, $wpdb->dbh);
$this->num_rows = mysql_num_rows($this->result);
$this->result = mysqli_query($wpdb->dbh, $query);
$this->num_rows = mysqli_num_rows($this->result);
$count_result = mysql_query("SELECT FOUND_ROWS()", $wpdb->dbh);
list($this->count) = mysql_fetch_row($count_result);
$count_result = mysqli_query($wpdb->dbh, "SELECT FOUND_ROWS()");
list($this->count) = mysqli_fetch_row($count_result);
}
public function setUserClass($classname) {
......@@ -154,7 +154,7 @@ class UserSearch implements ArrayAccess, Iterator, Countable {
$this->current = 0;
if ($this->num_rows > 0) {
mysql_data_seek($this->result, 0);
mysqli_data_seek($this->result, 0);
}
}
......@@ -176,10 +176,10 @@ class UserSearch implements ArrayAccess, Iterator, Countable {
}
if ($offset != $this->pos) {
mysql_data_seek($this->result, $offset);
mysqli_data_seek($this->result, $offset);
}
list($user_id, $user_string) = mysql_fetch_row($this->result);
list($user_id, $user_string) = mysqli_fetch_row($this->result);
$user_string = str_ireplace("\\'", "\\\\'", $user_string);
$json_data = json_decode($user_string, true);
if (json_last_error() != JSON_ERROR_NONE) {
......