[Cs-content-commits] SF.net SVN: cs-content:[343] releases/1.0

[<cra...@us...>]

Revision: 343
          http://cs-content.svn.sourceforge.net/cs-content/?rev=343&view=rev
Author:   crazedsanity
Date:     2009-02-01 18:12:51 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
*** RELEASE 1.0-ALPHA3 ***

SUMMARY OF CHANGES:
	* fix problem with begin+end definition for block row on same line (#230)

SVN COMMAND:
merge --depth=infinity -r340:HEAD https://cs-content.svn.sourceforge.net/svnroot/cs-content/trunk/1.0

Modified Paths:
--------------
    releases/1.0/VERSION
    releases/1.0/cs_genericPage.class.php

Modified: releases/1.0/VERSION
===================================================================
--- releases/1.0/VERSION	2009-02-01 17:54:01 UTC (rev 342)
+++ releases/1.0/VERSION	2009-02-01 18:12:51 UTC (rev 343)
@@ -1,5 +1,5 @@
 ## Stores the current version of the cs-content system, and it's source.  Please do NOT modify this file.
 
-VERSION: 1.0-ALPHA2
+VERSION: 1.0-ALPHA3
 PROJECT: cs-content
 $HeadURL$
\ No newline at end of file

Modified: releases/1.0/cs_genericPage.class.php
===================================================================
--- releases/1.0/cs_genericPage.class.php	2009-02-01 17:54:01 UTC (rev 342)
+++ releases/1.0/cs_genericPage.class.php	2009-02-01 18:12:51 UTC (rev 343)
@@ -530,14 +530,14 @@
 		if(strlen($templateContents) >= 31) {
 			//looks good to me.  Run the regex...
 			$flags = PREG_PATTERN_ORDER;
-			$reg = "/<!-- BEGIN (.+) -->/";
+			$reg = "/<!-- BEGIN (\S{1,}) -->/";
 			preg_match_all($reg, $templateContents, $beginArr, $flags);
 			$beginArr = $beginArr[1];
 			
-			$endReg = "/<!-- END (.+) -->/";
+			$endReg = "/<!-- END (\S{1,}) -->/";
 			preg_match_all($endReg, $templateContents, $endArr, $flags);
 			$endArr = $endArr[1];
-	
+			
 			//create a part of the array that shows any orphaned "BEGIN" statements (no matching "END"
 			// statement), and orphaned "END" statements (no matching "BEGIN" statements)
 			// NOTE::: by doing this, should easily be able to tell if the block rows were defined
@@ -577,6 +577,7 @@
 		$rowDefs = $this->get_block_row_defs($templateVar);
 		
 		$useTheseBlockRows = $rowDefs['ordered'];
+		
 		$retval = array();
 		if(is_array($useTheseBlockRows)) {
 			foreach($useTheseBlockRows as $blockRowName)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.