diff options
| author | Zach Copley <zach@status.net> | 2010-01-28 18:15:50 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-01-28 18:15:50 +0000 |
| commit | b96f30168cf4a6a36e5400fb9b00dec0c323e7d1 (patch) | |
| tree | d0c2268569d47f4e18c0f54b345ce470d58bf2c9 /lib | |
| parent | 558bf0f48907ad463872075c778c12bc5821f510 (diff) | |
| parent | 22d9c32e7e755c36817912cb9e20554b23d211d4 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 7 | ||||
| -rw-r--r-- | lib/noticelist.php | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/common.php b/lib/common.php index b4e4a653c..b482464aa 100644 --- a/lib/common.php +++ b/lib/common.php @@ -115,6 +115,10 @@ function __autoload($cls) require_once 'Validate.php'; require_once 'markdown.php'; +// XXX: other formats here + +define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER); + require_once INSTALLDIR.'/lib/util.php'; require_once INSTALLDIR.'/lib/action.php'; require_once INSTALLDIR.'/lib/mail.php'; @@ -136,6 +140,3 @@ try { exit; } -// XXX: other formats here - -define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER); diff --git a/lib/noticelist.php b/lib/noticelist.php index 78abf34a7..85c169716 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -555,11 +555,8 @@ class NoticeListItem extends Widget $this->out->raw(_('Repeated by')); - $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE); - $this->out->elementStart('a', $attrs); - - $this->out->element('span', 'nickname', $repeater->nickname); + $this->out->element('span', 'fn nickname', $repeater->nickname); $this->out->elementEnd('a'); $this->out->elementEnd('span'); |