[geeklog-cvs] geeklog: Merging - forgot to pull latest changes first

[geeklog-cvs at lists.geeklog.net]

changeset 8271:07c7d556a8b6
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/07c7d556a8b6
user: Dirk Haun <dirk at haun-online.de>
date: Sat May 07 23:24:11 2011 +0200
description:
Merging - forgot to pull latest changes first

diffstat:

 system/classes/template.class.php |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 1db1084aa5c6 -r 07c7d556a8b6 system/classes/template.class.php
--- a/system/classes/template.class.php	Sat May 07 23:23:34 2011 +0200
+++ b/system/classes/template.class.php	Sat May 07 23:24:11 2011 +0200
@@ -367,12 +367,12 @@
 
     $str = $this->get_var($parent);
     $reg = "/[ \t]*<!--\s+BEGIN $varname\s+-->\s*?\n?(\s*.*?\n?)\s*<!--\s+END $varname\s+-->\s*?\n?/sm";
-    $matches = preg_match_all($reg, $str, $m);
+    $matches = preg_match($reg, $str, $m);
     if (($matches === false) || ($matches == 0)) {
         return false;
     }
-    $str = str_replace($m[0][0], '{' . $name . '}', $str);
-    $this->set_var($varname, $m[1][0]);
+    $str = str_replace($m[0], '{' . $name . '}', $str);
+    $this->set_var($varname, $m[1]);
     $this->set_var($parent, $str);
     return true;
   }
@@ -1011,7 +1011,7 @@
   function set_root($A) {
     $this->root = Array();
 	foreach ($A as $r) {
-	  if (path_exists($r)) {
+	  if (is_dir($r)) {
 	    $this->root[] = $r;
 	  }
 	}