Changeset 8d9274c in git


Ignore:
Timestamp:
2012-12-17T13:35:48Z (7 years ago)
Author:
Xuefer <xuefer@…>
Branches:
3.0, 3.1, 3.2, master, trunk
Children:
c67d47e
Parents:
35a0b57
Message:

undefined variable when ini is not found

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1203 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • htdocs/diagnosis/index.php

    r35a0b57 r8d9274c  
    6565    $iniDirectory = '';
    6666    if (preg_match('!<td class="v">(.*?\\.ini)!', $info, $m)) {
    67         $loadedIni = $m[1];
     67        $loadedIni = trim($m[1]);
    6868    }
    6969    else if (preg_match('!Configuration File \\(php.ini\\) Path *</td><td class="v">([^<]+)!', $info, $m)) {
    70         $iniDirectory = $m[1];
     70        $iniDirectory = trim($m[1]);
    7171    }
    7272    return array($loadedIni, $iniDirectory, $iniInfo);
     
    8181        echo sprintf(_T("Add extension=xcache.so (or xcache.dll) in %s"), $loadedIni);
    8282    }
    83     else if (preg_match('!Configuration File \\(php.ini\\) Path *</td><td class="v">([^<]+)!', $loadedIni, $m)) {
     83    else if ($iniDirectory) {
    8484        echo sprintf(_T("Please put a php.ini in %s and add extension=xcache.so (or xcache.dll) in it"), $iniDirectory);
    8585    }
Note: See TracChangeset for help on using the changeset viewer.