Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 9993b2d3fde0b3473a84dbdb8e0c17151d0902cb..70c356659ac66442d846af16d25c7f5b65be292c 100644 (file)
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -109,7 +109,7 @@ class PublictagcloudAction extends Action
         $cutoff = sprintf("notice_tag.created > '%s'",
                           common_sql_date(time() - common_config('tag', 'cutoff')));
         $tags->selectAdd($calc . ' as weight');
-        $tags->addWhere($cutoff);
+        $tags->whereAdd($cutoff);
         $tags->groupBy('tag');
         $tags->orderBy('weight DESC');
 

diff --git a/plugins/OStatus/scripts/fixup-shadow.php b/plugins/OStatus/scripts/fixup-shadow.php
index 0171b77bc9d4933e6f08af14e4bdab4de1efc544..ec014c7878b5acaceae36b0610a0259128aaa13e 100644 (file)
--- a/plugins/OStatus/scripts/fixup-shadow.php
+++ b/plugins/OStatus/scripts/fixup-shadow.php
@@ -50,7 +50,7 @@ $encGroup = str_replace($marker, '%', $encGroup);
 $sql = "SELECT * FROM ostatus_profile WHERE uri LIKE '%s' OR uri LIKE '%s'";
 $oprofile->query(sprintf($sql, $encProfile, $encGroup));
 
-echo "Found $oprofile->N bogus ostatus_profile entries:\n";
+echo "Found $oprofile->N bogus ostatus_profile entries for local users and groups:\n";
 
 while ($oprofile->fetch()) {
     echo "$oprofile->uri";
@@ -58,7 +58,7 @@ while ($oprofile->fetch()) {
     if ($dry) {
         echo " (unchanged)\n";
     } else {
-        echo " deleting...";
+        echo " removing bogus ostatus_profile entry...";
         $evil = clone($oprofile);
         $evil->delete();
         echo "  ok\n";