GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

I had some inheritance the wrong way around.

This commit is contained in:
Mikael Nordfeldth 2015-07-04 19:48:35 +02:00
parent 5424c82423
commit 9054bb69e9
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/showstream.php
View File

@ -45,7 +45,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
class ShowstreamAction extends ProfileAction
class ShowstreamAction extends NoticestreamAction
{
var $notice;

20
lib/noticestreamaction.php
View File

@ -2,8 +2,24 @@
if (!defined('GNUSOCIAL')) { exit(1); }
interface NoticestreamAction
abstract class NoticestreamAction extends ProfileAction
{
protected function prepare(array $args=array()) {
parent::prepare($args);
// fetch the actual stream stuff
$stream = $this->getStream();
$this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
if ($this->page > 1 && $this->notice->N == 0) {
// TRANS: Client error when page not found (404).
$this->clientError(_('No such page.'), 404);
}
return true;
}
// this fetches the NoticeStream
public function getStream();
abstract public function getStream();
}

12
lib/profileaction.php
View File

@ -41,7 +41,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
abstract class ProfileAction extends ManagedAction implements NoticestreamAction
abstract class ProfileAction extends ManagedAction
{
var $page = null;
var $tag = null;
@ -65,16 +65,6 @@ abstract class ProfileAction extends ManagedAction implements NoticestreamAction
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
common_set_returnto($this->selfUrl());
// fetch the actual stream stuff
$stream = $this->getStream();
$this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
if ($this->page > 1 && $this->notice->N == 0) {
// TRANS: Client error when page not found (404).
$this->clientError(_('No such page.'), 404);
}
return true;
}