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

Fix for doc action on systems that return false for globbing in a non-existing dir

Browse Source
This commit is contained in:
Brion Vibber 2010-02-21 11:11:37 -08:00
parent 588fe5d603
commit 3e7a2a4014
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/doc.php
View File

@ -173,6 +173,10 @@ class DocAction extends Action
}
$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 (count($local) || isset($localDef)) {
return $this->negotiateLanguage($local, $localDef);
@ -183,6 +187,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);