Index: branches/5.3.x/core/kernel/globals.php
===================================================================
diff -u -N -r16519 -r16545
--- branches/5.3.x/core/kernel/globals.php	(.../globals.php)	(revision 16519)
+++ branches/5.3.x/core/kernel/globals.php	(.../globals.php)	(revision 16545)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 16519 2017-01-20 20:21:46Z alex $
+* @version	$Id: globals.php 16545 2017-07-02 13:50:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -928,6 +928,75 @@
 
 		throw new InvalidArgumentException(sprintf('Unknown escape strategy "%s"', $strategy));
 	}
+
+	/**
+	 * Mark a method as deprecated and inform when it has been used.
+	 *
+	 * The current behavior is to trigger a user deprecation notice in Debug Mode.
+	 * This method is to be used in every method that is deprecated.
+	 *
+	 * @param string      $method      The method that was called.
+	 * @param string      $version     The version that deprecated the method.
+	 * @param string|null $replacement The method that should have been called.
+	 *
+	 * @return void
+	 */
+	public static function deprecatedMethod($method, $version, $replacement = null)
+	{
+		$application =& kApplication::Instance();
+
+		if ( !$application->isDebugMode() ) {
+			return;
+		}
+
+		$msg = '%1$s is <strong>deprecated</strong> since version %2$s';
+
+		if ( !is_null($replacement) ) {
+			@trigger_error(sprintf($msg . '! Use %3$s instead.', $method, $version, $replacement), E_USER_DEPRECATED);
+		}
+		else {
+			@trigger_error(sprintf($msg . ' with no alternative available.', $method, $version), E_USER_DEPRECATED);
+		}
+	}
+
+	/**
+	 * Mark a method argument as deprecated and inform when it has been used.
+	 *
+	 * This method is to be used whenever a deprecated method argument is used.
+	 * Before this method is called, the argument must be checked for whether it was
+	 * used by comparing it to its default value or evaluating whether it is empty.
+	 * For example:
+	 *
+	 *     if ( !$deprecated ) {
+	 *         kUtil::deprecatedArgument(__METHOD__, '5.2.2');
+	 *     }
+	 *
+	 * The current behavior is to trigger a user deprecation notice in Debug Mode.
+	 *
+	 * @param string      $method  The method that was called.
+	 * @param string      $version The version that deprecated the argument used.
+	 * @param string|null $message A message regarding the change.
+	 *
+	 * @return void
+	 */
+	public static function deprecatedArgument($method, $version, $message = null)
+	{
+		$application =& kApplication::Instance();
+
+		if ( !$application->isDebugMode() ) {
+			return;
+		}
+
+		$msg = '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s';
+
+		if ( !is_null($message) ) {
+			@trigger_error(sprintf($msg . '! %3$s', $method, $version, $message), E_USER_DEPRECATED);
+		}
+		else {
+			@trigger_error(sprintf($msg . ' with no alternative available.', $method, $version), E_USER_DEPRECATED);
+		}
+	}
+
 }
 
 /**
Index: branches/5.3.x/core/kernel/utility/logger.php
===================================================================
diff -u -N -r16519 -r16545
--- branches/5.3.x/core/kernel/utility/logger.php	(.../logger.php)	(revision 16519)
+++ branches/5.3.x/core/kernel/utility/logger.php	(.../logger.php)	(revision 16545)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: logger.php 16519 2017-01-20 20:21:46Z alex $
+* @version	$Id: logger.php 16545 2017-07-02 13:50:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2012 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -734,15 +734,29 @@
 	/**
 	 * Writes prepared log to database or disk, when database isn't available
 	 *
-	 * @param int $storage_medium
-	 * @return bool|int
-	 * @access public
-	 * @throws InvalidArgumentException
+	 * @param integer $storage_medium Storage medium.
+	 * @param boolean $check_origin   Check error origin.
+	 *
+	 * @return integer|boolean
+	 * @throws InvalidArgumentException When unknown storage medium is given.
 	 */
-	public function write($storage_medium = self::LS_AUTOMATIC)
+	public function write($storage_medium = self::LS_AUTOMATIC, $check_origin = false)
 	{
-		if ( !$this->_logRecord || $this->_logRecord['LogLevel'] > $this->_maxLogLevel || $this->_state == self::STATE_DISABLED ) {
-			// nothing to save OR less detailed logging requested OR disabled
+		if ( $check_origin && isset($this->_logRecord['LogSourceFilename']) ) {
+			$origin_allowed = self::isErrorOriginAllowed($this->_logRecord['LogSourceFilename']);
+		}
+		else {
+			$origin_allowed = true;
+		}
+
+		if ( !$this->_logRecord
+			|| $this->_logRecord['LogLevel'] > $this->_maxLogLevel
+			|| !$origin_allowed
+			|| $this->_state == self::STATE_DISABLED
+		) {
+			// Nothing to save OR less detailed logging requested OR origin not allowed OR disabled.
+			$this->_logRecord = array();
+
 			return false;
 		}
 
@@ -1057,6 +1071,49 @@
 	}
 
 	/**
+	 * Determines if error should be logged based on it's origin.
+	 *
+	 * @param string $file File.
+	 *
+	 * @return boolean
+	 */
+	public static function isErrorOriginAllowed($file)
+	{
+		static $error_origin_regexp;
+
+		// Lazy detect error origins, because they're not available at construction time.
+		if ( !$error_origin_regexp ) {
+			$error_origins = array();
+			$application = kApplication::Instance();
+
+			foreach ( $application->ModuleInfo as $module_info ) {
+				$error_origins[] = preg_quote(rtrim($module_info['Path'], '/'), '/');
+			}
+
+			$error_origins = array_unique($error_origins);
+			$error_origin_regexp = '/^' . preg_quote(FULL_PATH, '/') . '\/(' . implode('|', $error_origins) . ')\//';
+		}
+
+		// Allow dynamically generated code.
+		if ( strpos($file, 'eval()\'d code') !== false ) {
+			return true;
+		}
+
+		// Allow known modules.
+		if ( preg_match('/^' . preg_quote(MODULES_PATH, '/') . '\//', $file) ) {
+			return preg_match($error_origin_regexp, $file) == 1;
+		}
+
+		// Don't allow Vendors.
+		if ( preg_match('/^' . preg_quote(FULL_PATH, '/') . '\/vendor\//', $file) ) {
+			return false;
+		}
+
+		// Allow everything else within main folder.
+		return preg_match('/^' . preg_quote(FULL_PATH, '/') . '\//', $file) == 1;
+	}
+
+	/**
 	 * Parses database error message into error number, error message and sql that caused that error
 	 *
 	 * @static
@@ -1165,6 +1222,13 @@
 		$this->_handlers[] = $handler;
 	}
 
+	/**
+	 * Returns `true`, when no other error handlers should process this error.
+	 *
+	 * @param integer $errno Error code.
+	 *
+	 * @return boolean
+	 */
 	protected function _handleFatalError($errno)
 	{
 		$debug_mode = defined('DEBUG_MODE') && DEBUG_MODE;
@@ -1182,7 +1246,7 @@
 			}
 		}
 
-		return null;
+		return false;
 	}
 
 	/**
@@ -1304,12 +1368,12 @@
 		$log = $this->_logger->prepare()->addError($errno, $errstr, $errfile, $errline);
 
 		if ( $this->_handleFatalError($errno) ) {
-			$log->write();
+			$log->write(kLogger::LS_AUTOMATIC, !$this->_isFatalError($errno));
 
 			return true;
 		}
 
-		$log->write();
+		$log->write(kLogger::LS_AUTOMATIC, !$this->_isFatalError($errno));
 
 		$res = false;
 
Index: branches/5.3.x/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r16519 -r16545
--- branches/5.3.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 16519)
+++ branches/5.3.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 16545)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger.php 16519 2017-01-20 20:21:46Z alex $
+* @version	$Id: debugger.php 16545 2017-07-02 13:50:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -724,6 +724,7 @@
 							'Fatal Error' => self::ROW_TYPE_ERROR,
 							'Warning' => self::ROW_TYPE_WARNING,
 							'Notice' => self::ROW_TYPE_NOTICE,
+							'Deprecation Notice' => self::ROW_TYPE_NOTICE,
 						);
 
 						return $error_map[$this->getErrorNameByCode($data['no'])];
@@ -1462,9 +1463,8 @@
 				);
 
 				if ( defined('E_DEPRECATED') ) {
-					// since PHP 5.3
-					$error_map['Notice'][] = E_DEPRECATED;
-					$error_map['Notice'][] = E_USER_DEPRECATED;
+					// Since PHP 5.3.
+					$error_map['Deprecation Notice'] = array(E_DEPRECATED, E_USER_DEPRECATED);
 				}
 
 				foreach ($error_map as $error_name => $error_codes) {
@@ -1879,6 +1879,9 @@
 					$this->_fatalErrorHash = $this->_getErrorHash($errfile, $errline);
 					$this->appendTrace(4);
 				}
+				elseif ( !kLogger::isErrorOriginAllowed($errfile) ) {
+					return;
+				}
 
 				$this->expandError($errstr, $errfile, $errline);
 
Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
diff -u -N -r16531 -r16545
--- branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16531)
+++ branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 16545)
@@ -2936,6 +2936,11 @@
 UPDATE SystemSettings SET VariableValue = 1 WHERE VariableName = 'CSVExportEncoding';
 ALTER TABLE Semaphores ADD MainIDs INT NULL DEFAULT NULL AFTER MainPrefix;
 
+# ===== v 5.2.2-B2 =====
+UPDATE Modules
+SET ClassNamespace = 'InPortal\\Core'
+WHERE `Name` IN ('Core', 'In-Portal');
+
 # ===== v 5.3.0-B1 =====
 ALTER TABLE ScheduledTasks ADD Settings TEXT NULL;
 ALTER TABLE Themes ADD ImageResizeRules TEXT NULL;
@@ -3033,9 +3038,10 @@
 	CHANGE SSLUrlUsesRegExp SSLDomainNameUsesRegExp TINYINT(4) NOT NULL DEFAULT '0';
 DELETE FROM UserPersistentSessionData WHERE VariableName = 'site-domain[Default]columns_.';
 
-UPDATE Modules
-SET ClassNamespace = 'InPortal\\Core'
-WHERE `Name` IN ('Core', 'In-Portal');
+# Backported in http://jira.in-portal.org/browse/INP-1690.
+# UPDATE Modules
+# SET ClassNamespace = 'InPortal\\Core'
+# WHERE `Name` IN ('Core', 'In-Portal');
 
 UPDATE EmailTemplates
 SET