Permalink
Browse files

Merge branch 'master' into branch_2.4

  • Loading branch information...
2 parents c5aef0f + 5fdb54c commit 6eae9b28e7848d06aca2a18e425d540d1efe570d @shish committed May 23, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 ext/simpletest/main.php
  2. +1 −1 index.php
View
@@ -200,7 +200,7 @@ function TestFinder($hint) {
$dir = "{".ENABLED_EXTS."}";
if(file_exists("ext/$hint/test.php")) $dir = $hint;
$this->TestSuite('All tests');
- foreach(glob("ext/$dir/test.php", GLOB_BRACE) as $file) {
+ foreach(zglob("ext/$dir/test.php") as $file) {
$this->addFile($file);
}
}
View
@@ -67,7 +67,7 @@
try {
// load base files
ctx_log_start("Opening files");
- $files = array_merge(glob("core/*.php"), glob("ext/{".ENABLED_EXTS."}/main.php", GLOB_BRACE));
+ $files = array_merge(zglob("core/*.php"), zglob("ext/{".ENABLED_EXTS."}/main.php"));
foreach($files as $filename) {
require_once $filename;
}

0 comments on commit 6eae9b2

Please sign in to comment.