Filter error location in JSON and XML responses

classes/display/DisplayHandler.class.php

@@ -57,6 +57,19 @@ class DisplayHandler extends Handler
 			$handler = new HTMLDisplayHandler();
 		}
 		
+		// Handle error location info
+		if ($location = $oModule->get('rx_error_location'))
+		{
+			if (!Rhymix\Framework\Debug::isEnabledForCurrentUser())
+			{
+				$oModule->unset('rx_error_location');
+			}
+			elseif (starts_with(\RX_BASEDIR, $location))
+			{
+				$oModule->add('rx_error_location', $location = substr($location, strlen(\RX_BASEDIR)));
+			}
+		}
+
 		$output = $handler->toDoc($oModule);
 
 		// call a trigger before display

classes/object/Object.class.php

@@ -280,6 +280,16 @@ class BaseObject
 		return $output;
 	}
 
+	/**
+	 * Method to delete a key
+	 *
+	 * @return void
+	 */
+	function unset($key)
+	{
+		unset($this->variables[$key]);
+	}
+
 	/**
 	 * Method to return either true or false depnding on the value in a 'error' variable
 	 *