[Cs-content-commits] SF.net SVN: cs-content:[353] trunk/1.0/cs_genericPage.class.php

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

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

Log Message:
-----------
Fix minor logic problem missed in last commit.

/cs_genericPage.class.php:
	* initialize_locals():
		-- sanity checking of dirname for mainTemplateFile before using it
		-- set siteRoot AND tmplDir no matter how they're derived.

Modified Paths:
--------------
    trunk/1.0/cs_genericPage.class.php

Modified: trunk/1.0/cs_genericPage.class.php
===================================================================
--- trunk/1.0/cs_genericPage.class.php	2009-02-04 16:42:52 UTC (rev 352)
+++ trunk/1.0/cs_genericPage.class.php	2009-02-04 16:54:59 UTC (rev 353)
@@ -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.