[Cs-content-commits] SF.net SVN: cs-content:[312] trunk/0.10/cs_globalFunctions.php

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

Revision: 312
          http://cs-content.svn.sourceforge.net/cs-content/?rev=312&view=rev
Author:   crazedsanity
Date:     2009-01-08 18:48:49 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Set debugPrintOpt to value of constant DEBUGPRINTOPT before trying GLOBALS.

/cs_globalFunctions.php:
	* __construct():
		-- check constants DEBUGPRINTOPT and DEBUGREMOVEHR prior to checking 
		GLOBALS; set to that value if available.
		-- NOTE: DEBUGPRINTOPT is set but DEBUGREMOVEHR isn't, then debugRemoveHr 
		will use the value in GLOBALS (if present); the inverse is also true. 
		This might cause some consistency issues in certain situations... 

Modified Paths:
--------------
    trunk/0.10/cs_globalFunctions.php

Modified: trunk/0.10/cs_globalFunctions.php
===================================================================
--- trunk/0.10/cs_globalFunctions.php	2009-01-08 05:28:35 UTC (rev 311)
+++ trunk/0.10/cs_globalFunctions.php	2009-01-08 18:48:49 UTC (rev 312)
@@ -17,10 +17,17 @@
 	public function __construct() {
 		//These checks have been implemented for pseudo backwards-compatibility 
 		//	(internal vars won't change if GLOBAL vars changed).
-		if(isset($GLOBALS['DEBUGREMOVEHR'])) {
+		if(defined('DEBUGREMOVEHR')) {
+			$this->debugRemoveHr = constant('DEBUGREMOVEHR');
+		}
+		elseif(isset($GLOBALS['DEBUGREMOVEHR'])) {
 			$this->debugRemoveHr = $GLOBALS['DEBUGREMOVEHR'];
 		}
-		if(isset($GLOBALS['DEBUGPRINTOPT'])) {
+		
+		if(defined('DEBUGPRINTOPT')) {
+			$this->debugPrintOpt = constant('DEBUGPRINTOPT');
+		}
+		elseif(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.