summaryrefslogtreecommitdiff
path: root/classes/db
diff options
context:
space:
mode:
Diffstat (limited to 'classes/db')
-rw-r--r--classes/db/mysqli.php2
-rw-r--r--classes/db/prefs.php6
2 files changed, 1 insertions, 7 deletions
diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php
index 817b48c0c..a05b121fc 100644
--- a/classes/db/mysqli.php
+++ b/classes/db/mysqli.php
@@ -65,7 +65,7 @@ class Db_Mysqli implements IDb {
}
function last_error() {
- return mysqli_error();
+ return mysqli_error($this->link);
}
function last_query_error() {
diff --git a/classes/db/prefs.php b/classes/db/prefs.php
index e704a135a..64238bc78 100644
--- a/classes/db/prefs.php
+++ b/classes/db/prefs.php
@@ -118,12 +118,6 @@ class Db_Prefs {
$user_id = sprintf("%d", $user_id);
}
- if ($profile) {
- $profile_qpart = "AND profile = '$profile'";
- } else {
- $profile_qpart = "AND profile IS NULL";
- }
-
if (!$profile || get_schema_version() < 63) $profile = null;
$type_name = "";