Merge branch '1.0.x'

This commit is contained in:
Evan Prodromou 2011-10-20 10:54:41 -04:00
commit ba3f6b2db9

View File

@ -223,7 +223,7 @@ class AllAction extends ProfileAction
// XXX: make this a little more convenient // XXX: make this a little more convenient
if (!common_config('performance', 'high')) { if (!common_config('performance', 'high')) {
$pop = new PopularNoticeSection($this); $pop = new PopularNoticeSection($this, Profile::current());
$pop->show(); $pop->show();
$pop = new InboxTagCloudSection($this, $this->user); $pop = new InboxTagCloudSection($this, $this->user);
$pop->show(); $pop->show();