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

lib: Assume relative path for Config::resolvePath()

This commit is contained in:
Alexander Klimov 2014-06-25 11:43:39 +02:00
parent ebca81b040
commit a18058e185
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Application/Config.php
View File

@ -165,16 +165,6 @@ class Config extends Zend_Config
*/ */
public static function resolvePath($path) public static function resolvePath($path)
{ {
if (Platform::isWindows()) { return self::$configDir . DIRECTORY_SEPARATOR . ltrim($path, DIRECTORY_SEPARATOR);
throw new ProgrammingError('Windows support has not yet been implemented');
}
if (strpos(dirname($path), DIRECTORY_SEPARATOR) === 0) {
return $path;
}
$path = self::$configDir . DIRECTORY_SEPARATOR . $path;
$canonical = realpath($path);
return ($canonical === false) ? $path : $canonical;
} }
} }