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

IniRepository: Fix that method update and delete fail without filter

This commit is contained in:
Johannes Meyer 2016-10-27 15:09:00 +02:00
parent 5212b6bab9
commit f644860529
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Icinga/Repository/IniRepository.php
View File

@ -93,15 +93,12 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
); );
} }
$query = $this->ds->select();
if ($filter !== null) { if ($filter !== null) {
$filter = $this->requireFilter($target, $filter); $query->addFilter($this->requireFilter($target, $filter));
} }
$newSection = null; $newSection = null;
$query = $this->ds->select();
$query->addFilter($filter);
foreach ($query as $section => $config) { foreach ($query as $section => $config) {
if ($newSection !== null) { if ($newSection !== null) {
throw new StatementException( throw new StatementException(
@ -149,12 +146,10 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
*/ */
public function delete($target, Filter $filter = null) public function delete($target, Filter $filter = null)
{ {
if ($filter !== null) {
$filter = $this->requireFilter($target, $filter);
}
$query = $this->ds->select(); $query = $this->ds->select();
$query->addFilter($filter); if ($filter !== null) {
$query->addFilter($this->requireFilter($target, $filter));
}
foreach ($query as $section => $config) { foreach ($query as $section => $config) {
$this->ds->removeSection($section); $this->ds->removeSection($section);