[icinga-checkins] icinga.org: icingaweb2-module-director/master: IcingaObject: fix comments for disabled object...

git at icinga.org git at icinga.org
Mon Jun 13 17:21:30 CEST 2016


Module: icingaweb2-module-director
Branch: master
Commit: b83bfed18645ffb380bff28155f0735133503620
URL:    https://git.icinga.org/?p=icingaweb2-module-director.git;a=commit;h=b83bfed18645ffb380bff28155f0735133503620

Author: Thomas Gelf <thomas at gelf.net>
Date:   Mon Jun 13 17:20:44 2016 +0200

IcingaObject: fix comments for disabled object...

...and switch to multiline comments, they look better in our diffs

fixes #11937

---

 library/Director/Objects/IcingaObject.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Director/Objects/IcingaObject.php b/library/Director/Objects/IcingaObject.php
index 6954c38..50cc003 100644
--- a/library/Director/Objects/IcingaObject.php
+++ b/library/Director/Objects/IcingaObject.php
@@ -1389,8 +1389,8 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
         ));
 
         if ($this->isDisabled()) {
-            return "// --- This object has been disabled ---\n// \n// "
-                . str_replace("\n", "\n// ", $str);
+            return "/* --- This object has been disabled ---\n"
+                . $str . "*/\n";
         } else {
             return $str;
         }



More information about the icinga-checkins mailing list