Merge branch '0.7.x' into 0.8.x

3 files changed, 5 insertions, 5 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index c321311ac..9b5194a5c 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -593,7 +593,7 @@ class Notice extends Memcached_DataObject
             $inbox = new Notice_inbox();
             $UT = common_config('db','type')=='pgsql'?'"user"':'user';
             $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
-              "SELECT $UT.id, " . $this->id . ', "' . $this->created . '" ' .
+              "SELECT $UT.id, " . $this->id . ", '" . $this->created . "' " .
               "FROM $UT JOIN subscription ON $UT.id = subscription.subscriber " .
               'WHERE subscription.subscribed = ' . $this->profile_id . ' ' .
               'AND NOT EXISTS (SELECT user_id, notice_id ' .
@@ -663,7 +663,7 @@ class Notice extends Memcached_DataObject
                 $inbox = new Notice_inbox();
                 $UT = common_config('db','type')=='pgsql'?'"user"':'user';
                 $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created, source) ' .
-                  "SELECT $UT.id, " . $this->id . ', "' . $this->created . '", 2 ' .
+                  "SELECT $UT.id, " . $this->id . ", '" . $this->created . "', 2 " .
                   "FROM $UT JOIN group_member ON $UT.id = group_member.profile_id " .
                   'WHERE group_member.group_id = ' . $group->id . ' ' .
                   'AND NOT EXISTS (SELECT user_id, notice_id ' .
diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 0365973f5..f2247299a 100644
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -40,7 +40,7 @@ class Notice_tag extends Memcached_DataObject
         $qry =
           'SELECT notice.* ' .
           'FROM notice JOIN notice_tag ON notice.id = notice_tag.notice_id ' .
-          'WHERE notice_tag.tag = "%s" ';
+          "WHERE notice_tag.tag = '%s' ";
 
         return Notice::getStream(sprintf($qry, $tag),
                                  'notice_tag:notice_stream:' . common_keyize($tag),
diff --git a/classes/User.php b/classes/User.php
index 40cf18df6..8b0b9acd5 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -589,7 +589,7 @@ class User extends Memcached_DataObject
           'JOIN profile_tag ON (profile_tag.tagged = subscription.subscriber ' .
           'AND profile_tag.tagger = subscription.subscribed) ' .
           'WHERE subscription.subscribed = %d ' .
-          'AND profile_tag.tag = "%s" ' .
+          "AND profile_tag.tag = '%s' " .
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';
 
@@ -617,7 +617,7 @@ class User extends Memcached_DataObject
           'JOIN profile_tag on (profile_tag.tagged = subscription.subscribed ' .
           'AND profile_tag.tagger = subscription.subscriber) ' .
           'WHERE subscription.subscriber = %d ' .
-          'AND profile_tag.tag = "%s" ' .
+          "AND profile_tag.tag = '%s' " .
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';