GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Allow site-specific doc files

This commit is contained in:
Zach Copley 2010-03-10 22:05:28 +00:00
parent 6d73fc1d54
commit 2a426f24c0
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
actions/doc.php
View File

@ -13,7 +13,7 @@
* @link http://status.net/ * @link http://status.net/
* *
* StatusNet - the distributed open-source microblogging tool * 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 * 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 * it under the terms of the GNU Affero General Public License as published by
@ -168,14 +168,28 @@ class DocAction extends Action
function getFilename() function getFilename()
{ {
if (file_exists(INSTALLDIR.'/local/doc-src/'.$this->title)) { $localDef = null;
$localDef = INSTALLDIR.'/local/doc-src/'.$this->title; $local = null;
}
$local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*'); $site = StatusNet::currentSite();
if ($local === false) {
// Some systems return false, others array(), if dir didn't exist. if (!empty($site) && file_exists(INSTALLDIR.'/local/doc-src/'.$site.'/'.$this->title)) {
$local = array(); $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)) { if (count($local) || isset($localDef)) {