[icinga-checkins] icinga.org: icingaweb2/master: Do not try to detect the library path in index.php

git at icinga.org git at icinga.org
Wed Nov 12 15:42:12 CET 2014


Module: icingaweb2
Branch: master
Commit: 8b1419bb04c20feb9fb7650d73799f61b013396c
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=8b1419bb04c20feb9fb7650d73799f61b013396c

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Wed Nov 12 15:41:04 2014 +0100

Do not try to detect the library path in index.php

Packagers will use a custom index.php.

---

 public/index.php |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/index.php b/public/index.php
index 085f737..48a5006 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,8 +2,4 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-if (! @include_once dirname(__DIR__) . '/library/Icinga/Application/webrouter.php') {
-    // If the Icinga library wasn't found under ICINGAWEB_BASEDIR, require that the Icinga library is found in PHP's
-    // include path which is the case if Icinga Web 2 is installed via packages
-    require_once 'Icinga/Application/webrouter.php';
-}
+require_once dirname(__DIR__) . '/library/Icinga/Application/webrouter.php';



More information about the icinga-checkins mailing list