Changeset 1203 for trunk/htdocs/diagnosis/index.php

Timestamp:

2012-12-17T14:35:48+01:00 (6 months ago)

Author:

moo

Message:

undefined variable when ini is not found

File:

• trunk/htdocs/diagnosis/index.php (modified) (2 diffs)

trunk/htdocs/diagnosis/index.php

@@ -65 +65 @@
     $iniDirectory = '';
     if (preg_match('!<td class="v">(.*?\\.ini)!', $info, $m)) {
-        $loadedIni = $m[1];
+        $loadedIni = trim($m[1]);
     }
     else if (preg_match('!Configuration File \\(php.ini\\) Path *</td><td class="v">([^<]+)!', $info, $m)) {
-        $iniDirectory = $m[1];
+        $iniDirectory = trim($m[1]);
     }
     return array($loadedIni, $iniDirectory, $iniInfo);
@@ -81 +81 @@
         echo sprintf(_T("Add extension=xcache.so (or xcache.dll) in %s"), $loadedIni);
     }
-    else if (preg_match('!Configuration File \\(php.ini\\) Path *</td><td class="v">([^<]+)!', $loadedIni, $m)) {
+    else if ($iniDirectory) {
         echo sprintf(_T("Please put a php.ini in %s and add extension=xcache.so (or xcache.dll) in it"), $iniDirectory);
     }