From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 21 Jan 2015 22:45:49 +0000 (+0100)
Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fac9f4e5455787eab32a9f7a7176aeab84fcf483;p=quix0rs-gnu-social.git

Merge branch 'nightly' of gitorious.org:social/mainline into nightly
---

fac9f4e5455787eab32a9f7a7176aeab84fcf483
diff --cc actions/apiaccountverifycredentials.php
index 6cc61cf6da,6cc61cf6da..9b98fa6d81
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@@ -48,18 -48,18 +48,9 @@@ if (!defined('STATUSNET')) 
   */
  class ApiAccountVerifyCredentialsAction extends ApiAuthAction
  {
--    /**
--     * Handle the request
--     *
--     * Check whether the credentials are valid and output the result
--     *
--     * @param array $args $_REQUEST data (unused)
--     *
--     * @return void
--     */
--    function handle($args)
++    protected function handle()
      {
--        parent::handle($args);
++        parent::handle();
  
          if (!in_array($this->format, array('xml', 'json'))) {
              // TRANS: Client error displayed when coming across a non-supported API method.
diff --cc actions/public.php
index 6ebd48ba12,6ebd48ba12..52bab072ae
--- a/actions/public.php
+++ b/actions/public.php
@@@ -53,7 -53,7 +53,8 @@@ class PublicAction extends Actio
  
      var $page = null;
      var $notice;
--    var $userProfile = null;
++
++    protected $stream = null;
  
      function isReadOnly($args)
      {
@@@ -67,7 -67,7 +68,7 @@@
       *
       * @return boolean success value
       */
--    function prepare($args)
++    protected function prepare(array $args=array())
      {
          parent::prepare($args);
          $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@@ -80,17 -80,17 +81,9 @@@
  
          common_set_returnto($this->selfUrl());
  
--        $this->userProfile = Profile::current();
--
--        $user = common_current_user();
--
--        if (!empty($user) && $user->streamModeOnly()) {
--            $stream = new PublicNoticeStream($this->userProfile);
--        } else {
--            $stream = new ThreadingPublicNoticeStream($this->userProfile);
--        }
++        $this->streamPrepare();
  
--        $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
++        $this->notice = $this->stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                              NOTICES_PER_PAGE + 1);
  
          if (!$this->notice) {
@@@ -98,7 -98,7 +91,7 @@@
              $this->serverError(_('Could not retrieve public timeline.'));
          }
  
--        if($this->page > 1 && $this->notice->N == 0){
++        if ($this->page > 1 && $this->notice->N == 0){
              // TRANS: Server error when page not found (404).
              $this->serverError(_('No such page.'),$code=404);
          }
@@@ -106,6 -106,6 +99,15 @@@
          return true;
      }
  
++    protected function streamPrepare()
++    {
++        if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) {
++            $this->stream = new PublicNoticeStream($this->scoped);
++        } else {
++            $this->stream = new ThreadingPublicNoticeStream($this->scoped);
++        }
++    }
++
      /**
       * handle request
       *
@@@ -115,9 -115,9 +117,9 @@@
       *
       * @return void
       */
--    function handle($args)
++    protected function handle()
      {
--        parent::handle($args);
++        parent::handle();
  
          $this->showPage();
      }
@@@ -222,7 -222,7 +224,7 @@@
          if (!empty($user) && $user->streamModeOnly()) {
              $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
          } else {
--            $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
++            $nl = new ThreadedNoticeList($this->notice, $this, $this->scoped);
          }
  
          $cnt = $nl->show();
diff --cc classes/Profile.php
index e850b629d4,00a457a5c9..8352861fe6
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@@ -1565,12 -1565,8 +1565,17 @@@ class Profile extends Managed_DataObjec
          return $this->getUser()->shortenLinks($text, $always);
      }
  
 +    public function delPref($namespace, $topic) {
 +        return Profile_prefs::setData($this, $namespace, $topic, null);
 +    }
 +
      public function getPref($namespace, $topic, $default=null) {
--        return Profile_prefs::getData($this, $namespace, $topic, $default);
++        // If you want an exception to be thrown, call Profile_prefs::getData directly
++        try {
++            return Profile_prefs::getData($this, $namespace, $topic, $default);
++        } catch (NoResultException $e) {
++            return null;
++        }
      }
  
      public function setPref($namespace, $topic, $data) {
diff --cc lib/default.php
index de07a8ee47,d442e1a85a..465a5142a3
--- a/lib/default.php
+++ b/lib/default.php
@@@ -144,7 -144,7 +144,7 @@@ $default 
                'path' => $_path . '/background/',
                'ssl' => null),
          'public' =>
--        array('localonly' => true,
++        array('localonly' => false,
                'blacklist' => array(),
                'autosource' => array()),
          'theme' =>
diff --cc lib/router.php
index 8260cb3e2e,8260cb3e2e..a3be38ebbd
--- a/lib/router.php
+++ b/lib/router.php
@@@ -163,6 -163,6 +163,9 @@@ class Route
                  $m->connect('main/'.$a, array('action' => $a));
              }
  
++            $m->connect('main/public', array('action' => 'public'));
++            $m->connect('main/all', array('action' => 'networkpublic'));
++
              $m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
                                                 array('id' => '[0-9]+'));
  
@@@ -945,7 -945,7 +948,9 @@@
                                  array('tag' => self::REGEX_TAG));
                  }
              } else {
++                $m->connect('main/public', array('action' => 'public'));
                  $m->connect('', array('action' => 'public'));
++                $m->connect('main/all', array('action' => 'networkpublic'));
                  $m->connect('rss', array('action' => 'publicrss'));
                  $m->connect('featuredrss', array('action' => 'featuredrss'));
                  $m->connect('featured/', array('action' => 'featured'));
diff --cc theme/neo-quitter/css/display.css
index 22a477a49f,22a477a49f..3532e9dd1f
--- a/theme/neo-quitter/css/display.css
+++ b/theme/neo-quitter/css/display.css
@@@ -1720,7 -1720,7 +1720,6 @@@ ul.messages .notice .p-author 
  	}	
  
  #content .threaded-replies .notice-options {
--	position:absolute;
  	bottom:0;
  	right:0px;
  	height:25px;