From ff767a14ff7675fce7b23b918f41fa92157dd0c0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 22 Sep 2014 03:31:11 -0400
Subject: [PATCH] Merge branch 'oracle'
---
bin/moduserprefs.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/moduserprefs.sh b/bin/moduserprefs.sh
index 049372c..e892b1f 100755
--- a/bin/moduserprefs.sh
+++ b/bin/moduserprefs.sh
@@ -47,7 +47,7 @@
$pref_value = $args['delete'] ? null : trim($args[1]);
// connect to DB
-$rcmail = rcmail::get_instance();
+$rcmail = rcube::get_instance();
$db = $rcmail->get_dbh();
$db->db_connect('w');
@@ -58,10 +58,10 @@
$query = '1=1';
if ($args['user'])
- $query = 'user_id=' . intval($args['user']);
+ $query = '`user_id` = ' . intval($args['user']);
// iterate over all users
-$sql_result = $db->query("SELECT * FROM " . $rcmail->config->get('db_table_users', 'users')." WHERE $query");
+$sql_result = $db->query("SELECT * FROM " . $db->table_name('users', true) . " WHERE $query");
while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
echo "Updating prefs for user " . $sql_arr['user_id'] . "...";
--
Gitblit v1.9.1