summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/postnotice.php2
-rw-r--r--actions/twittersettings.php8
-rw-r--r--lib/jabber.php4
-rw-r--r--lib/util.php4
4 files changed, 9 insertions, 9 deletions
diff --git a/actions/postnotice.php b/actions/postnotice.php
index 0b4735296..c32d8ca94 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -79,7 +79,7 @@ class PostnoticeAction extends Action
}
$notice = Notice::staticGet('uri', $notice_uri);
if (!$notice) {
- $notice = Notice::saveNew($remote_profile->id, $content, 'omb', false, 0, $notice_uri);
+ $notice = Notice::saveNew($remote_profile->id, $content, 'omb', false, null, $notice_uri);
if (is_string($notice)) {
common_server_serror($notice, 500);
return false;
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index a79859bbf..45725d3ff 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -186,12 +186,12 @@ class TwittersettingsAction extends ConnectSettingsAction
$current_user = common_current_user();
- $qry = 'SELECT user.* ' .
+ $qry = 'SELECT "user".* ' .
'FROM subscription ' .
- 'JOIN user ON subscription.subscribed = user.id ' .
- 'JOIN foreign_link ON foreign_link.user_id = user.id ' .
+ 'JOIN "user" ON subscription.subscribed = "user".id ' .
+ 'JOIN foreign_link ON foreign_link.user_id = "user".id ' .
'WHERE subscriber = %d ' .
- 'ORDER BY user.nickname';
+ 'ORDER BY "user".nickname';
$user = new User();
diff --git a/lib/jabber.php b/lib/jabber.php
index 3fbb3e1ab..3cd3b0d37 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -410,8 +410,8 @@ function jabber_broadcast_notice($notice)
"ON $UT.id = notice_inbox.user_id " .
'WHERE notice_inbox.notice_id = ' . $notice->id . ' ' .
'AND notice_inbox.source = 2 ' .
- 'AND user.jabber is not null ' .
- 'AND user.jabbernotify = 1 ');
+ "AND $UT.jabber is not null " .
+ "AND $UT.jabbernotify = 1 ");
while ($user->fetch()) {
if (!array_key_exists($user->id, $sent_to)) {
diff --git a/lib/util.php b/lib/util.php
index ca8376f28..221175ccd 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -688,7 +688,7 @@ function common_relative_profile($sender, $nickname, $dt=null)
$recipient = new Profile();
// XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender->id.' and subscribed = id)', 'AND');
- $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
+ $recipient->whereAdd("nickname = '" . trim($nickname) . "'", 'AND');
if ($recipient->find(true)) {
// XXX: should probably differentiate between profiles with
// the same name by date of most recent update
@@ -698,7 +698,7 @@ function common_relative_profile($sender, $nickname, $dt=null)
$recipient = new Profile();
// XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender->id.' and subscriber = id)', 'AND');
- $recipient->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
+ $recipient->whereAdd("nickname = '" . trim($nickname) . "'", 'AND');
if ($recipient->find(true)) {
// XXX: should probably differentiate between profiles with
// the same name by date of most recent update