From: Roland Haeder <roland@mxchange.org>
Date: Mon, 11 Jan 2016 21:45:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1663e2743bb295e04a0d0399d201b45668025e88;p=quix0rs-gnu-social.git

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

Maintained a type-hint

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

1663e2743bb295e04a0d0399d201b45668025e88
diff --cc actions/apilists.php
index 129691a3b4,0b241638ad..42672e6191
--- a/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 plugins/DirectionDetector/DirectionDetectorPlugin.php
index 73ea999408,b721ebb20e..468a9441dd
--- a/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/OStatus/classes/Ostatus_profile.php
index ca1708282e,d36cbe21d6..9d41b67273
--- a/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(),