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

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

Revision: 372
          http://cs-content.svn.sourceforge.net/cs-content/?rev=372&view=rev
Author:   crazedsanity
Date:     2009-05-01 13:42:14 +0000 (Fri, 01 May 2009)

Log Message:
-----------
Fix missing array in set_message().

cs_genericPage.class.php:
	-- set_message():
		* added missing $priorityArr in call to array_keys() when type
		isn't set (this supposedly sets the default type to "notice", or
		whatever is the first index in the $priorityArr).

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-04-22 20:43:39 UTC (rev 371)
+++ trunk/1.0/cs_genericPage.class.php	2009-05-01 13:42:14 UTC (rev 372)
@@ -419,7 +419,7 @@
 		);
 		if(!isset($type) || !isset($priorityArr[$type])) {
 			//set a default type.
-			$arrayKeys = array_keys();
+			$arrayKeys = array_keys($priorityArr);
 			$type = $arrayKeys[0];
 		}
 		
@@ -593,7 +593,7 @@
 	
 	
 	//---------------------------------------------------------------------------------------------
-	function rip_all_block_rows($templateVar="content", $exceptionArr=array()) {
+	function rip_all_block_rows($templateVar="content", $exceptionArr=array(), $removeDefs=0) {
 		$rowDefs = $this->get_block_row_defs($templateVar);
 		
 		
@@ -604,10 +604,10 @@
 			if(is_array($useTheseBlockRows)) {
 				foreach($useTheseBlockRows as $blockRowName)
 				{
-					if(!in_array($blockRowName, $exceptionArr))
+					if(!is_array($exceptionArr) || !in_array($blockRowName, $exceptionArr))
 					{
 						//remove the block row.
-						$rowData = $this->set_block_row($templateVar, $blockRowName);
+						$rowData = $this->set_block_row($templateVar, $blockRowName, $removeDefs);
 						$retval[$blockRowName] = $rowData;
 					}
 				}
@@ -621,9 +621,9 @@
 	
 	
 	//---------------------------------------------------------------------------------------------
-	public function set_all_block_rows($templateVar="content", $exceptionArr=array())
+	public function set_all_block_rows($templateVar="content", $exceptionArr=array(), $removeDefs=0)
 	{
-		$retval = $this->rip_all_block_rows($templateVar, $exceptionArr);
+		$retval = $this->rip_all_block_rows($templateVar, $exceptionArr, $removeDefs);
 		return($retval);
 	}//end set_all_block_rows()
 	//---------------------------------------------------------------------------------------------


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