Changeset 422 for branches/1.2

Show
Ignore:
Timestamp:
06/21/2007 03:44:18 PM (17 months ago)
Author:
moo
Message:

merged [421] from trunk->1.2: updated notice for when missing php.ini

Location:
branches/1.2
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416 to /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421

  • branches/1.2/admin/xcache.php

    r373 r422  
    9292    if (preg_match('!<td class="v">(.*\\.ini)!', $info, $m)) { 
    9393        echo "Please check $m[1]"; 
     94    } 
     95    else if (preg_match('!Configuration File \\(php.ini\\) Path *</td><td class="v">([^<]+)!', $info, $m)) { 
     96        echo "Please put a php.ini in $m[1] and load XCache extension"; 
    9497    } 
    9598    else {