diff options
| -rw-r--r-- | actions/groupmembers.php | 4 | ||||
| -rw-r--r-- | actions/peopletag.php | 4 | ||||
| -rw-r--r-- | actions/subscribers.php | 4 | ||||
| -rwxr-xr-x | scripts/strip_geo.php | 16 |
4 files changed, 23 insertions, 5 deletions
diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 6d0701239..54f1d8dcd 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -238,9 +238,13 @@ class GroupMemberListItem extends ProfileListItem function homepageAttributes() { + $aAttrs = parent::linkAttributes(); + if (common_config('nofollow', 'members')) { $aAttrs['rel'] = 'nofollow'; } + + return $aAttrs; } /** diff --git a/actions/peopletag.php b/actions/peopletag.php index 456cc21c4..32652f755 100644 --- a/actions/peopletag.php +++ b/actions/peopletag.php @@ -168,9 +168,13 @@ class PeopleTagListItem extends ProfileListItem function homepageAttributes() { + $aAttrs = parent::linkAttributes(); + if (common_config('nofollow', 'peopletag')) { $aAttrs['rel'] = 'nofollow'; } + + return $aAttrs; } } diff --git a/actions/subscribers.php b/actions/subscribers.php index 6fdf43e2c..2845a498e 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -181,8 +181,12 @@ class SubscribersListItem extends SubscriptionListItem function homepageAttributes() { + $aAttrs = parent::linkAttributes(); + if (common_config('nofollow', 'subscribers')) { $aAttrs['rel'] = 'nofollow'; } + + return $aAttrs; } } diff --git a/scripts/strip_geo.php b/scripts/strip_geo.php index 010fb31f5..b3f27be61 100755 --- a/scripts/strip_geo.php +++ b/scripts/strip_geo.php @@ -21,7 +21,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); $shortoptions = 'i::n::y'; -$longoptions = array('id=', 'nickname=', 'yes', 'dry-run'); +$longoptions = array('id=', 'nickname=', 'yes', 'dry-run', 'all'); $helptext = <<<END_OF_HELP strip_geo.php [options] @@ -31,6 +31,8 @@ Removes geolocation info from the given user's notices. -n --nickname nickname of the user -y --yes do not wait for confirmation --dry-run list affected notices without deleting + --all run over and decache all messages, even if they don't + have geo data now (helps to fix cache bugs) END_OF_HELP; @@ -67,10 +69,14 @@ if (!have_option('y', 'yes') && !have_option('--dry-run')) { } // @fixme for a very prolific poster this could be too many. -print "Finding notices with geolocation data..."; $notice = new Notice(); $notice->profile_id = $profile->id; -$notice->whereAdd("lat != ''"); +if (have_option('--all')) { + print "Finding all notices by $profile->nickname..."; +} else { + print "Finding notices by $profile->nickname with geolocation data..."; + $notice->whereAdd("lat != ''"); +} $notice->find(); if ($notice->N) { @@ -101,10 +107,10 @@ if ($notice->N) { $ok = $update->query($query); if ($ok) { // And now we decache him manually, as query() doesn't know what we're doing... - $orig->blow(); + $orig->decache(); echo "(removed)"; } else { - echo "(failed?)"; + echo "(unchanged?)"; } } print "\n"; |