summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-10 22:05:28 +0000
committerZach Copley <zach@status.net>2010-03-10 22:27:28 +0000
commit2a426f24c0599710ef170b01f7f7124b7166e12e (patch)
tree56e4efe35dbd90091bcef7000efecfefc87689dd
parent6d73fc1d5439439cca5a6af3f05b39bdf4ef20aa (diff)
Allow site-specific doc files
-rw-r--r--actions/doc.php30
1 files changed, 22 insertions, 8 deletions
diff --git a/actions/doc.php b/actions/doc.php
index 459f5f096..f876fb8be 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -13,7 +13,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
@@ -168,14 +168,28 @@ 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 ($local === false) {
- // Some systems return false, others array(), if dir didn't exist.
- $local = array();
+ 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)) {