Changeset 255 for branches/1.1/coverager/coverager.php

Timestamp:

2006-10-17T20:30:41+02:00 (7 years ago)

Author:

moo

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:

• . (modified) (1 prop)
• coverager/coverager.php (modified) (2 diffs)

branches/1.1/coverager/coverager.php

@@ -62 +62 @@
         $this->path = isset($_GET['path']) ? $_GET['path'] : '';
         $this->path = preg_replace('!\.{2,}!', '.', $this->path);
-        $this->path = preg_replace('![\\\\/]{2,}!', '/', $this->path);
+        $qsep = preg_quote(DIRECTORY_SEPARATOR, '!');
+        $this->path = preg_replace("![\\\\$qsep]{2,}!", DIRECTORY_SEPARATOR, $this->path);
+        $this->path = preg_replace("!$qsep$!", '', $this->path);
         if ($this->path == '/') {
             $this->path = '';
@@ -118 +120 @@
             list($tplfile, $tpllines, $tplcov) = $this->loadTplCov($fileinfo['cov'], substr($this->outpath, $this->datadir_len));
             if ($tplfile) {
-                $tplcov = sprint_cov($tplinfo['tplcov'], $tpllines);
+                $tplcov = sprint_cov($tplcov, $tpllines);
                 unset($tpllines);
             }