From: Mikael Nordfeldth Date: Mon, 12 May 2014 09:13:13 +0000 (+0200) Subject: Not sure how much time to spend on GNUsocialPhotos plugin X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d59b39275bda813bf37a3db02c12ac8e6333bfde;p=quix0rs-gnu-social.git Not sure how much time to spend on GNUsocialPhotos plugin --- diff --git a/plugins/GNUsocialPhotos/actions/photo.php b/plugins/GNUsocialPhotos/actions/photo.php index e94073914f..6e807b4ccc 100644 --- a/plugins/GNUsocialPhotos/actions/photo.php +++ b/plugins/GNUsocialPhotos/actions/photo.php @@ -28,18 +28,14 @@ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 */ -if (!defined('STATUSNET')) { - exit(1); -} - -include_once INSTALLDIR . '/actions/conversation.php'; -include_once INSTALLDIR . '/classes/Notice.php'; +if (!defined('GNUSOCIAL')) { exit(1); } -class PhotoAction extends Action +class PhotoAction extends ManagedAction { var $user = null; + var $conv = null; // Conversation dataobject - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); @@ -49,17 +45,9 @@ class PhotoAction extends Action $this->notice = Notice::getKV('id', $this->photo->notice_id); $this->user = Profile::getKV('id', $this->notice->profile_id); - - $notices = Notice::conversationStream((int)$this->notice->conversation, null, null); - $this->conversation = new ConversationTree($notices, $this); - return true; - - } + $this->conv = $this->notice->getConversation(); - function handle($args) - { - parent::handle($args); - $this->showPage(); + return true; } function title() @@ -102,6 +90,12 @@ class PhotoAction extends Action $this->element('p', array('class' => 'photodescription'), $this->photo->photo_description); //This is a hack to hide the top-level comment $this->element('style', array(), "#notice-{$this->photo->notice_id} div { display: none } #notice-{$this->photo->notice_id} ol li div { display: inline }"); - $this->conversation->show(); + + if (Event::handle('StartShowConversation', array($this, $this->conv, $this->scoped))) { + $notices = $this->conv->getNotices(); + $nl = new FullThreadedNoticeList($notices, $this, $this->scoped); + $cnt = $nl->show(); + } + Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped)); } }