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

correctly parse help files

This commit is contained in:
Evan Prodromou 2011-04-18 06:30:33 -04:00
parent 9c12aa29ef
commit 4784e3fe36
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/docfile.php
View File

@ -57,7 +57,7 @@ class DocFile
static function forTitle($title, $paths) static function forTitle($title, $paths)
{ {
if (is_string($paths)) { if (!is_array($paths)) {
$paths = array($paths); $paths = array($paths);
} }
@ -66,6 +66,7 @@ class DocFile
foreach ($paths as $path) { foreach ($paths as $path) {
$def = $path.'/'.$title; $def = $path.'/'.$title;
if (!file_exists($def)) { if (!file_exists($def)) {
$def = null; $def = null;
} }
@ -95,7 +96,7 @@ class DocFile
$this->contents = file_get_contents($this->filename); $this->contents = file_get_contents($this->filename);
} }
$this->output = common_markup_to_html($this->contents); return common_markup_to_html($this->contents);
} }
static function defaultPaths() static function defaultPaths()
@ -108,6 +109,8 @@ class DocFile
if (!empty($site)) { if (!empty($site)) {
array_unshift($paths, INSTALLDIR.'/local/doc-src/'.$site.'/'); array_unshift($paths, INSTALLDIR.'/local/doc-src/'.$site.'/');
} }
return $paths;
} }
static function negotiateLanguage($filenames, $defaultFilename=null) static function negotiateLanguage($filenames, $defaultFilename=null)