From: Roland Haeder <roland@mxchange.org>
Date: Fri, 27 Mar 2015 21:24:37 +0000 (+0100)
Subject: Merge branch 'rewrites-master/type-hints-asserts' into rewrites-nightly/type-hints... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6a37106003808d1ded8adcd117dca1f561be7fb8;p=quix0rs-gnu-social.git

Merge branch 'rewrites-master/type-hints-asserts' into rewrites-nightly/type-hints-asserts

Conflicts:
	classes/Notice.php
	lib/docfile.php
	lib/framework.php

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

6a37106003808d1ded8adcd117dca1f561be7fb8
diff --cc actions/replies.php
index 5bf2f8edc4,11d9c7c706..ce65fef7a9
--- a/actions/replies.php
+++ b/actions/replies.php
@@@ -74,26 -93,23 +74,6 @@@ class RepliesAction extends ManagedActi
              // TRANS: Client error when page not found (404)
              $this->clientError(_('No such page.'), 404);
          }
- <<<<<<< HEAD
--
--        return true;
--    }
--
--    /**
--     * Handle a request
--     *
--     * Just show the page. All args already handled.
--     *
--     * @param array $args $_REQUEST data
--     *
--     * @return void
--     */
--    function handle(array $args=array())
--    {
--        parent::handle($args);
--        $this->showPage();
- =======
- >>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
      }
  
      /**
diff --cc lib/docfile.php
index 316aebb872,2e2afbd014..583f7ebc9b
--- a/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.'/');
          }