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

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

Revision: 355
          http://cs-content.svn.sourceforge.net/cs-content/?rev=355&view=rev
Author:   crazedsanity
Date:     2009-02-04 17:04:36 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
*** RELEASE 1.0-ALPHA6 ***

SUMMARY OF CHANGES:::
 * fix minor logic problem in previous release.

SVN COMMAND:::
merge --depth=infinity -r352: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-04 17:02:47 UTC (rev 354)
+++ releases/1.0/VERSION	2009-02-04 17:04:36 UTC (rev 355)
@@ -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-ALPHA5
+VERSION: 1.0-ALPHA6
 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-04 17:02:47 UTC (rev 354)
+++ releases/1.0/cs_genericPage.class.php	2009-02-04 17:04:36 UTC (rev 355)
@@ -62,14 +62,15 @@
 	protected function initialize_locals($mainTemplateFile) {
 		
 		
-		if(strlen(dirname($mainTemplateFile)) && dirname($mainTemplateFile) !== '/') {
+		if(strlen(dirname($mainTemplateFile)) && dirname($mainTemplateFile) !== '/' && !preg_match('/^\./', dirname($mainTemplateFile))) {
 			$this->tmplDir = dirname($mainTemplateFile);
+			$this->siteRoot = preg_replace('/\/templates$/', '', $this->tmplDir);
 		}
 		else {
 			//NOTE: this **requires** that the global variable "SITE_ROOT" is already set.
 			$this->siteRoot = preg_replace('/\/public_html/', '', $_SERVER['DOCUMENT_ROOT']);
+			$this->tmplDir = $this->siteRoot .'/templates';
 		}
-		$this->siteRoot = preg_replace('/\/templates$/', '', $this->tmplDir);
 		$this->libDir = $this->siteRoot .'/lib';
 		
 		//if there have been some global template vars (or files) set, read 'em in here.


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