Fix xhprof config

diff --git a/.composer-require-checker.config.json b/.composer-require-checker.config.json
index b9fa1b4c657f82ebfd795da8c32c0c7c047a2a66..67e0ea2ed5e880ffdc5f1c4c8705be688916a4bb 100644 (file)
--- a/.composer-require-checker.config.json
+++ b/.composer-require-checker.config.json
@@ -73,6 +73,7 @@
     "XHProfRuns_Default",
     "xhprof_disable",
     "xhprof_enable",
+    "GALETTE_XHPROF_PATH",
     "XHPROF_PATH",
     "XHPROF_URL",
     "XHPROF_FLAGS_CPU",

diff --git a/galette/config/paths.inc.php b/galette/config/paths.inc.php
index 9e9a8890785916be14538008b3f0321dc8279281..53ba6a2a7a10b505de28c843ba607d43c695cb6c 100644 (file)
--- a/galette/config/paths.inc.php
+++ b/galette/config/paths.inc.php
@@ -73,9 +73,9 @@ if (!defined('GALETTE_TCPDF_PATH')) {
 if ( !defined('GALETTE_SLIM_VIEWS_PATH') ) {
     define('GALETTE_SLIM_VIEWS_PATH', GALETTE_ROOT . 'lib/Slim-Views');
 }*/
-/*if ( !defined('GALETTE_XHPROF_PATH') ) {
+if ( !defined('GALETTE_XHPROF_PATH') ) {
     define('GALETTE_XHPROF_PATH', '/usr/share/xhprof/');
-}*/
+}
 
 //galete's paths
 if (!defined('GALETTE_CONFIG_PATH')) {

diff --git a/galette/lib/Galette/Common/XHProf.php b/galette/lib/Galette/Common/XHProf.php
index 476256a3af204f347b0b62074f3e13f186720fee..8ef677118814f4870fc788cfb64d6335fdcb9cfd 100644 (file)
--- a/galette/lib/Galette/Common/XHProf.php
+++ b/galette/lib/Galette/Common/XHProf.php
@@ -135,7 +135,7 @@ class XHProf
         if (self::$run) {
             $data = xhprof_disable();
 
-            $incl = (defined('XHPROF_PATH') ? XHPROF_PATH : self::XHPROF_PATH);
+            $incl = (defined('GALETTE_XHPROF_PATH') ? GALETTE_XHPROF_PATH : self::XHPROF_PATH);
             include_once $incl . '/utils/xhprof_lib.php';
             include_once $incl . '/utils/xhprof_runs.php';