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

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

Revision: 382
          http://cs-content.svn.sourceforge.net/cs-content/?rev=382&view=rev
Author:   crazedsanity
Date:     2009-05-28 03:54:58 +0000 (Thu, 28 May 2009)

Log Message:
-----------
Revert changes from r380 (accidentally committed to trunk).

Modified Paths:
--------------
    releases/1.0/contentSystem.class.php

Property Changed:
----------------
    releases/1.0/contentSystem.class.php
    releases/1.0/cs_fileSystem.class.php
    releases/1.0/cs_genericPage.class.php
    releases/1.0/cs_globalFunctions.class.php
    releases/1.0/cs_phpDB.class.php
    releases/1.0/cs_session.class.php
    releases/1.0/cs_siteConfig.class.php
    releases/1.0/cs_tabs.class.php
    releases/1.0/required/template.inc

Modified: releases/1.0/contentSystem.class.php
===================================================================
--- releases/1.0/contentSystem.class.php	2009-05-27 16:06:18 UTC (rev 381)
+++ releases/1.0/contentSystem.class.php	2009-05-28 03:54:58 UTC (rev 382)
@@ -339,17 +339,6 @@
 	 * Retrieves the list of templates & includes in preparation for later work.
 	 */
 	private function prepare() {
-		
-		//Set the final section... 
-		if(count($this->sectionArr)) {
-			$mySectionArr = $this->sectionArr;
-			$this->finalSection = array_pop($mySectionArr);
-		}
-		else {
-			throw new exception(__METHOD__ .": FATAL - section array is empty");
-		}
-		
-		
 		//attempt to load any includes...
 		if($this->fileSystemObj->cd('/includes')) {
 			$this->load_includes();
@@ -459,10 +448,12 @@
 			
 			if(isset($lsData[$sectionFile]) && is_array($lsData[$sectionFile])) {
 				$valid = TRUE;
+				$this->finalSection = $this->baseDir;
 			}
 			elseif(isset($sectionLsData[$myFile]) && $sectionLsData[$myFile]['type'] == 'file') {
 				//we're good.
 				$valid = TRUE;
+				$this->finalSection = $this->baseDir;
 			}
 			else {
 				$this->reason = __METHOD__ .": couldn't find base template.";
@@ -662,9 +653,6 @@
 		
 		//okay, now loop through $this->sectionArr & see if we can include anything else.
 		$addIndex=false;
-		if($this->finalSection == 'index') {
-			$addIndex = true;
-		}
 		if(($this->fileSystemObj->cd($this->baseDir)) && is_array($this->sectionArr) && count($this->sectionArr) > 0) {
 			
 			
@@ -684,9 +672,6 @@
 				if(!$this->fileSystemObj->cd($mySection)) {
 					//no dice.  Break the loop.
 					$addIndex = false;
-					if($this->finalSection == 'index') {
-						$addIndex = true;
-					}
 					break;
 				}
 				else {


Property changes on: releases/1.0/contentSystem.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/cs_fileSystem.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/cs_genericPage.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/cs_globalFunctions.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/cs_phpDB.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/cs_session.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/cs_siteConfig.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/cs_tabs.class.php
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: releases/1.0/required/template.inc
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


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