Merge remote-tracking branch 'upstream/master' into social-master

Maintained a type-hint

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc actions/apilistmemberships.php
Simple merge

diff --cc actions/apilists.php
index 129691a3b42f8c58b09835c38b906c179f12dea4,0b241638ad6c8fd61616efb2fdfd2ab8691c02f7..42672e6191c40aacf46561341a184d778fa4c5c5
--- 1/actions/apilists.php
--- 2/actions/apilists.php
+++ b/actions/apilists.php
@@@ -185,10 -185,10 +185,10 @@@ class ApiListsAction extends ApiBareAut
  
          list($this->lists,
               $this->next_cursor,
-              $this->prev_cursor) = Profile_list::getAtCursor($fn, array($this->auth_user), $cursor, $count);
+              $this->prev_cursor) = Profile_list::getAtCursor($fn, array($this->scoped), $cursor, $count);
      }
  
 -    function isReadOnly($args)
 +    function isReadOnly(array $args=array())
      {
          return false;
      }

diff --cc actions/apisearchatom.php
Simple merge

diff --cc actions/peopletagautocomplete.php
Simple merge

diff --cc actions/peopletagsbyuser.php
Simple merge

diff --cc actions/peopletagsforuser.php
Simple merge

diff --cc classes/Avatar.php
Simple merge

diff --cc classes/File_redirection.php
Simple merge

diff --cc classes/File_thumbnail.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/User_group.php
Simple merge

diff --cc lib/attachmentlist.php
Simple merge

diff --cc lib/attachmentlistitem.php
Simple merge

diff --cc lib/httpclient.php
Simple merge

diff --cc lib/noticelistitem.php
Simple merge

diff --cc lib/profileaction.php
Simple merge

diff --cc lib/threadednoticelist.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/DirectionDetector/DirectionDetectorPlugin.php
index 73ea99940804e800b3d304c44725483937e22edc,b721ebb20e62f7195b1cff6ed22b65cc1fe8c2db..468a9441ddc3d6674de56f06018a4e5aa1b5430d
--- 1/plugins/DirectionDetector/DirectionDetectorPlugin.php
--- 2/plugins/DirectionDetector/DirectionDetectorPlugin.php
+++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php
@@@ -36,7 -36,8 +36,8 @@@ class DirectionDetectorPlugin extends P
       *
       * @param object $notice notice is going to be saved
       */
 -    public function onStartNoticeSave($notice){
 +    public function onStartNoticeSave(Notice $notice) {
+         // don't use getRendered() here since it's not saved yet and thus can't ->update in case that would happen
          if(!preg_match('/<span class="rtl">/', $notice->rendered) && self::isRTL($notice->content))
              $notice->rendered = '<span class="rtl">'.$notice->rendered.'</span>';
          return true;

diff --cc plugins/Directory/actions/groupdirectory.php
Simple merge

diff --cc plugins/Directory/lib/sortablegrouplist.php
Simple merge

diff --cc plugins/Event/classes/RSVP.php
Simple merge

diff --cc plugins/Favorite/classes/Fave.php
Simple merge

diff --cc plugins/Mapstraction/actions/map.php
Simple merge

diff --cc plugins/NoticeTitle/NoticeTitlePlugin.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
index ca1708282e9c392cff1a5b452033ffb4ff348de7,d36cbe21d66c902579e680224cfa2d0a967da3d5..9d41b6727341d41eaa31949f574bd1b2c6cd47c4
--- 1/plugins/OStatus/classes/Ostatus_profile.php
--- 2/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@@ -371,12 -371,12 +371,13 @@@ class Ostatus_profile extends Managed_D
       * send immediately but won't get the return value.
       *
       * @param mixed $entry XML string, Notice, or Activity
 +     * @param Profile $actor Acting profile
       * @return boolean success
       */
 -    public function notifyDeferred($entry, $actor)
 +    public function notifyDeferred($entry, Profile $actor)
      {
          if ($this->salmonuri) {
+             common_debug("OSTATUS: user {$actor->getNickname()} ({$actor->getID()}) wants to ping {$this->localProfile()->getNickname()} on {$this->salmonuri}");
              $data = array('salmonuri' => $this->salmonuri,
                            'entry' => $this->notifyPrepXml($entry),
                            'actor' => $actor->getID(),

diff --cc plugins/OStatus/lib/ostatusqueuehandler.php
Simple merge

diff --cc plugins/Oembed/actions/oembed.php
Simple merge

diff --cc plugins/OpenID/OpenIDPlugin.php
Simple merge

diff --cc plugins/OpportunisticQM/lib/opportunisticqueuemanager.php
Simple merge

diff --cc plugins/Realtime/RealtimePlugin.php
Simple merge

diff --cc plugins/SubMirror/classes/SubMirror.php
Simple merge

diff --cc scripts/checkschema.php
Simple merge

diff --cc scripts/updateurls.php
Simple merge

diff --cc scripts/upgrade.php
Simple merge