tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: Prefer "root" doc path over configured path 

If the "root" doc path, i.e. application/doc exists, it is preferred over the configured
one.

refs #4075
This commit is contained in:
Eric Lippmann 2014-12-09 14:55:24 +01:00
parent 3120a0c090
commit d2a7254a37
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/doc/application/controllers/IcingawebController.php
View File

@ -17,15 +17,15 @@ class Doc_IcingawebController extends DocController
*/
protected function getPath()
{
$path = Icinga::app()->getBaseDir('doc');
if (is_dir($path)) {
return $path;
}
if (($path = $this->Config()->get('documentation', 'icingaweb2')) !== null) {
if (is_dir($path)) {
return $path;
}
}
$path = Icinga::app()->getBaseDir('doc');
if (is_dir($path)) {
return $path;
}
throw new Zend_Controller_Action_Exception(
$this->translate('Documentation for Icinga Web 2 is not available'),
404

6
modules/doc/application/controllers/ModuleController.php
View File

@ -25,15 +25,15 @@ class Doc_ModuleController extends DocController
*/
protected function getPath($module, $default, $suppressErrors = false)
{
if (is_dir($default)) {
return $default;
}
if (($path = $this->Config()->get('documentation', 'modules')) !== null) {
$path = str_replace('{module}', $module, $path);
if (is_dir($path)) {
return $path;
}
}
if (is_dir($default)) {
return $default;
}
if ($suppressErrors) {
return null;
}