Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/popularity.php b/lib/popularity.php
index b6987138b..7ab259a39 100644
--- a/lib/popularity.php
+++ b/lib/popularity.php
@@ -53,12 +53,12 @@ class Popularity
     {
         // @fixme there should be a common func for this
         if (common_config('db', 'type') == 'pgsql') {
-            if (!empty($this->out->tag)) {
-                $tag = pg_escape_string($this->out->tag);
+            if (!empty($this->tag)) {
+                $tag = pg_escape_string($this->tag);
             }
         } else {
-            if (!empty($this->out->tag)) {
-                 $tag = mysql_escape_string($this->out->tag);
+            if (!empty($this->tag)) {
+                 $tag = mysql_escape_string($this->tag);
             }
         }
         $weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff'));