X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fdoc.php;h=20cf9e2810b66c9790f87d95f183bfc0aa98277b;hb=bcafe0f81904be866ae270b61798cdc49ff47feb;hp=eaf4b7df2d8f0b62365b718cca266ffe572ac1f8;hpb=0787daff2cd3d73ac1a4af2353b35f6199ebff49;p=quix0rs-gnu-social.git

diff --git a/actions/doc.php b/actions/doc.php
index eaf4b7df2d..20cf9e2810 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Documentation action.
  *
@@ -13,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2010, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -83,7 +82,6 @@ class DocAction extends Action
      *
      * @return void
      */
-
     function showPageTitle()
     {
         $this->element('h1', array('class' => 'entry-title'), $this->title());
@@ -96,7 +94,6 @@ class DocAction extends Action
      *
      * @return void.
      */
-
     function showContentBlock()
     {
         $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
@@ -117,7 +114,6 @@ class DocAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $this->raw($this->output);
@@ -142,7 +138,6 @@ class DocAction extends Action
      *
      * @return boolean read-only flag (false)
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -155,7 +150,9 @@ class DocAction extends Action
             $this->filename = $this->getFilename();
 
             if (empty($this->filename)) {
-                throw new ClientException(sprintf(_('No such document "%s"'), $this->title), 404);
+                // TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+                // TRANS: %s is the non-existing document.
+                throw new ClientException(sprintf(_('No such document "%s".'), $this->title), 404);
             }
 
             $c = file_get_contents($this->filename);
@@ -168,11 +165,29 @@ class DocAction extends Action
 
     function getFilename()
     {
-        if (file_exists(INSTALLDIR.'/local/doc-src/'.$this->title)) {
-            $localDef = INSTALLDIR.'/local/doc-src/'.$this->title;
-        }
+        $localDef = null;
+        $local    = null;
+
+        $site = StatusNet::currentSite();
 
-        $local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
+        if (!empty($site) && file_exists(INSTALLDIR.'/local/doc-src/'.$site.'/'.$this->title)) {
+            $localDef = INSTALLDIR.'/local/doc-src/'.$site.'/'.$this->title;
+
+            $local = glob(INSTALLDIR.'/local/doc-src/'.$site.'/'.$this->title.'.*');
+            if ($local === false) {
+                // Some systems return false, others array(), if dir didn't exist.
+                $local = array();
+            }
+        } else {
+            if (file_exists(INSTALLDIR.'/local/doc-src/'.$this->title)) {
+                $localDef = INSTALLDIR.'/local/doc-src/'.$this->title;
+            }
+
+            $local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
+            if ($local === false) {
+                $local = array();
+            }
+        }
 
         if (count($local) || isset($localDef)) {
             return $this->negotiateLanguage($local, $localDef);
@@ -183,6 +198,9 @@ class DocAction extends Action
         }
 
         $dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
+        if ($dist === false) {
+            $dist = array();
+        }
 
         if (count($dist) || isset($distDef)) {
             return $this->negotiateLanguage($dist, $distDef);