Merge branch 'master' into usb-lock-offusb-lock-off

1 files changed, 10 insertions, 1 deletions

diff --git a/index.php b/index.php
index d7018e17..1ecd2109 100644
--- a/index.php
+++ b/index.php
@@ -79,7 +79,7 @@ abstract class Page
 		if (self::$module === false) {
 			Util::traceError('Invalid Module: ' . $name);
 		}
-		self::$module->activate();
+		self::$module->activate(null, null);
 		self::$instance = self::$module->newPage();
 	}
 
@@ -104,6 +104,15 @@ spl_autoload_register(function ($class) {
 
 if (defined('CONFIG_DEBUG') && CONFIG_DEBUG) {
 	set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+		if (preg_match('/^\[skip:\s*(\d+)\]\s*(.*)/is', $errstr, $out)) {
+			$errstr = $out[2];
+			$trace = debug_backtrace();
+			$idx = (int)$out[1] + 1;
+			if (count($trace) > $idx) {
+				$errfile = $trace[$idx]['file'];
+				$errline = $trace[$idx]['line'];
+			}
+		}
 		global $SLX_ERRORS;
 		$SLX_ERRORS[] = array(
 			'errno' => $errno,