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

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

Revision: 387
          http://cs-content.svn.sourceforge.net/cs-content/?rev=387&view=rev
Author:   crazedsanity
Date:     2009-06-04 15:11:11 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
Fix cs_globalFunctions::debug_print() so GLOBALS settings override constants.

/cs_globalFunctions.class.php:
	* __construct():
		-- reset internal debugRemoveHr and debugPrintOpt to GLOBAL values if 
		present, even when CONSTANT values were previously used.

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

Modified: trunk/1.0/cs_globalFunctions.class.php
===================================================================
--- trunk/1.0/cs_globalFunctions.class.php	2009-06-01 14:49:57 UTC (rev 386)
+++ trunk/1.0/cs_globalFunctions.class.php	2009-06-04 15:11:11 UTC (rev 387)
@@ -20,14 +20,14 @@
 		if(defined('DEBUGREMOVEHR')) {
 			$this->debugRemoveHr = constant('DEBUGREMOVEHR');
 		}
-		elseif(isset($GLOBALS['DEBUGREMOVEHR'])) {
+		if(isset($GLOBALS['DEBUGREMOVEHR'])) {
 			$this->debugRemoveHr = $GLOBALS['DEBUGREMOVEHR'];
 		}
 		
 		if(defined('DEBUGPRINTOPT')) {
 			$this->debugPrintOpt = constant('DEBUGPRINTOPT');
 		}
-		elseif(isset($GLOBALS['DEBUGPRINTOPT'])) {
+		if(isset($GLOBALS['DEBUGPRINTOPT'])) {
 			$this->debugPrintOpt = $GLOBALS['DEBUGPRINTOPT'];
 		}
 		$this->set_version_file_location(dirname(__FILE__) . '/VERSION');


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