Merge branch 'master' of git.mxchange.org:/var/cache/git/repos/quix0rs-gnu-social...

Conflicts:
	actions/showstream.php
	classes/Notice.php
	lib/docfile.php

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

diff --cc actions/invite.php
Simple merge

diff --cc classes/Notice.php
index ee515595bbc7079e30892b07a3093b677f33ca13,3825e07a0f51745cd770f23c6c6e77491acc7e85..a6cf90da5555d86cba759b9ac223e8d2ca29d6a7
--- 1/classes/Notice.php
--- 2/classes/Notice.php
+++ b/classes/Notice.php
@@@ -2904,4 -2943,31 +2904,5 @@@ class Notice extends Managed_DataObjec
              $notice->_setReplies($ids);
          }
      }
 -    protected $_repeats = array();
 -
 -    function getRepeats()
 -    {
 -        if (isset($this->_repeats[$this->id])) {
 -            return $this->_repeats[$this->id];
 -        }
 -        $repeatMap = Notice::listGet('repeat_of', array($this->id));
 -        $this->_setRepeats($repeatMap[$this->id]);
 -        return $this->_repeats[$this->id];
 -    }
 -
 -    function _setRepeats(array $repeats)
 -    {
 -        $this->_repeats[$this->id] = $repeats;
 -    }
 -
 -    static function fillRepeats(array &$notices)
 -    {
 -        $ids = self::_idsOf($notices);
 -        $repeatMap = Notice::listGet('repeat_of', $ids);
 -        foreach ($notices as $notice) {
 -            $repeats = $repeatMap[$notice->id];
 -            $notice->_setRepeats($repeats);
 -        }
 -    }
+ 
  }

diff --cc lib/docfile.php
index 316aebb8726304430f411ff8489174d3f9eab660,2e2afbd014de511f6c3acb75fa04eee8e56e9006..583f7ebc9b3190353763ca2439f9d42f1815511c
--- 1/lib/docfile.php
--- 2/lib/docfile.php
+++ b/lib/docfile.php
@@@ -113,8 -105,8 +105,8 @@@ class DocFil
          $paths = array(INSTALLDIR.'/local/doc-src/',
                         INSTALLDIR.'/doc-src/');
  
 -        $site = StatusNet::currentSite();
 +        $site = GNUsocial::currentSite();
-         
+ 
          if (!empty($site)) {
              array_unshift($paths, INSTALLDIR.'/local/doc-src/'.$site.'/');
          }
@@@ -127,8 -119,8 +119,8 @@@
          $paths = array(INSTALLDIR.'/local/mail-src/',
                         INSTALLDIR.'/mail-src/');
  
 -        $site = StatusNet::currentSite();
 +        $site = GNUsocial::currentSite();
-         
+ 
          if (!empty($site)) {
              array_unshift($paths, INSTALLDIR.'/local/mail-src/'.$site.'/');
          }