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

Dashboard: fix complex urls

This commit is contained in:
Thomas Gelf 2014-11-19 16:44:45 +01:00
parent 92b2c5061d
commit fa44197947
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/File/Ini/IniEditor.php
View File

@ -493,7 +493,7 @@ class IniEditor
private function isPropertyDeclaration($lineContent, array $key)
{
return preg_match(
'/^\s*' . $this->formatKey($key) . '\s*=\s*/',
'/^\s*' . preg_quote($this->formatKey($key)) . '\s*=\s*/',
$lineContent
) === 1;
}

5
library/Icinga/Web/Widget/Dashboard/Component.php
View File

@ -156,15 +156,12 @@ EOD;
public function toArray()
{
$array = array(
'url' => $this->url->getPath(),
'url' => $this->url->getRelativeUrl(),
'title' => $this->getTitle()
);
if ($this->getDisabled() === true) {
$array['disabled'] = 1;
}
foreach ($this->url->getParams()->toArray() as $param) {
$array[$param[0]] = $param[1];
}
return $array;
}