Merge from github for functions.inc.php.

cclark61 · Aug 28, 2014 · ed79e85 · ed79e85
2 parents 1551e60 + da9a938
commit ed79e85
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/framework/app_logic/logic2/functions.inc.php b/framework/app_logic/logic2/functions.inc.php
@@ -91,8 +91,8 @@ function execute_page_controller(&$page, $args=false)
 	// Display: "Page Not Found"
 	//============================================================
 	if ($throw_404) {
-		$controller = "{$controller_path}/error/controller_404.php";
-		if (file_exists($controller)) { include($controller); }
+		$controller_404 = "{$controller_path}/error/controller_404.php";
+		if (file_exists($controller_404)) { include($controller_404); }
 		else {
 			if (BUFFER_PAGE) { ob_end_clean(); }
 			die('404 controller not found.');
@@ -107,8 +107,8 @@ function execute_page_controller(&$page, $args=false)
 	// Display: "Page Error"
 	//============================================================
 	else if ($throw_500 || isset($_SESSION['throw_500'])) {
-		$controller = "{$controller_path}/error/controller_500.php";
-		if (file_exists($controller)) { include($controller); }
+		$controller_500 = "{$controller_path}/error/controller_500.php";
+		if (file_exists($controller_500)) { include($controller_500); }
 		else {
 			if (BUFFER_PAGE) { ob_end_clean(); }
 			die('500 controller not found.');
@@ -176,4 +176,4 @@ function load_plugin($plugin)
 	$GLOBALS['pco']->load_plugin($plugin);
 }
 
-?>
+?>