diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-19 15:29:00 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-19 15:29:00 -0700 |
| commit | 79ec565104b8d546e4f2ffca2f351fba1be753d2 (patch) | |
| tree | c92916aac3354722f597f3dd3a6c8fd65ea94a36 | |
| parent | 1292230e380300e194f0695f95fe1554cd7863a5 (diff) | |
| parent | 8a221228ebac156cbbb4693b06e25a0c59c858c3 (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
| -rw-r--r-- | actions/publictagcloud.php | 2 | ||||
| -rw-r--r-- | plugins/OStatus/scripts/fixup-shadow.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php index 9993b2d3f..70c356659 100644 --- 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 0171b77bc..ec014c787 100644 --- 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"; |