Ignore:
Timestamp:
2006-10-17T18:30:41Z (9 years ago)
Author:
Xuefer
Message:
  • fix build on rare arch
  • fix build on Mac OS X
  • merged from trunk: 159,161-162,167-180,182,184,186-187,194
    • [194] PHP_5_2: new element in zend_brk_cont_element
    • [186] [187] fix build on some rare arch
    • [184] fix tplcov
    • [178] fix type processor_t conflict with Mac OS X
Location:
branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1

  • branches/1.1/admin/config.php.example

    r125 r255  
    1616function ob_filter_path_nicer($o)
    1717{
    18     $o = str_replace($_SERVER['DOCUMENT_ROOT'],  "{DOCROOT}/", $o);
    19     $xcachedir = realpath(dirname(__FILE__) . "/../");
    20     $o = str_replace($xcachedir . "/", "{XCache}/", $o);
    21     $o = str_replace("/home/", "{H}/", $o);
     18    $sep = DIRECTORY_SEPARATOR;
     19    $o = str_replace($_SERVER['DOCUMENT_ROOT'],  "{DOCROOT}$sep", $o);
     20    $xcachedir = realpath(dirname(__FILE__) . "$sep..$sep");
     21    $o = str_replace($xcachedir . $sep, "{XCache}$sep", $o);
     22    if ($sep == '/') {
     23        $o = str_replace("/home/", "{H}/", $o);
     24    }
    2225    return $o;
    2326}
Note: See TracChangeset for help on using the changeset viewer.