From 53274a6d9347c256430187a22347ca4a0910a395 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 26 Jan 2009 21:10:32 +0000 Subject: PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries --- lib/mail.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/mail.php') diff --git a/lib/mail.php b/lib/mail.php index 1c6a10a8a..b424d579f 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -331,12 +331,13 @@ function mail_broadcast_notice_sms($notice) $user = new User(); + $UT = common_config('db','type')=='pgsql'?'"user"':'user'; $user->query('SELECT nickname, smsemail, incomingemail ' . - 'FROM user JOIN subscription ' . - 'ON user.id = subscription.subscriber ' . + "FROM $UT JOIN subscription " . + "ON $UT.id = subscription.subscriber " . 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' . - 'AND user.smsemail IS NOT null ' . - 'AND user.smsnotify = 1 ' . + "AND $UT.smsemail IS NOT null " . + "AND $UT.smsnotify = 1 " . 'AND subscription.sms = 1 '); while ($user->fetch()) { -- cgit v1.2.3-54-g00ecf