Merge branch 'staging' of https://github.com/joomla/joomla-cms into s…

…taging
joomla · Aug 15, 2016 · 14f5b1c · 14f5b1c
2 parents 2baa00b + edb70c2
commit 14f5b1c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1426,6 +1426,7 @@ public function deleteUnexistingFiles()
 			'/administrator/templates/isis/js/jquery.js',
 			'/administrator/templates/isis/js/bootstrap.min.js',
 			'/media/system/js/permissions.min.js',
+			'/libraries/platform.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode

diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
@@ -508,4 +508,21 @@ protected static function load($option)
 
 		return true;
 	}
+
+	/**
+	 * Get installed components
+	 *
+	 * @return  array  The components property
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function getComponents()
+	{
+		if (empty(static::$components))
+		{
+			static::load('*');
+		}
+
+		return static::$components;
+	}
 }
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
@@ -115,6 +115,19 @@ public function parse(&$uri)
 		// Set the route
 		$uri->setPath(trim($path, '/'));
 
+		// Set the parsepreprocess components methods
+		$components = JComponentHelper::getComponents();
+
+		foreach ($components as $component)
+		{
+			$componentRouter = $this->getComponentRouter($component->option);
+
+			if (method_exists($componentRouter, 'parsepreprocess'))
+			{
+				$this->attachParseRule(array($componentRouter, 'parsepreprocess'), static::PROCESS_BEFORE);
+			}
+		}
+
 		$vars += parent::parse($uri);
 
 		return $vars;

diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
@@ -36,12 +36,6 @@
 	define('IS_MAC', (IS_UNIX === true && ($os === 'DAR' || $os === 'MAC')) ? true : false);
 }
 
-// Import the platform version library if necessary.
-if (!class_exists('JPlatform'))
-{
-	require_once JPATH_PLATFORM . '/platform.php';
-}
-
 // Import the library loader if necessary.
 if (!class_exists('JLoader'))
 {

diff --git a/libraries/import.php b/libraries/import.php
@@ -28,12 +28,6 @@
 	define('IS_UNIX', (IS_WIN === false) ? true : false);
 }
 
-// Import the platform version library if necessary.
-if (!class_exists('JPlatform'))
-{
-	require_once JPATH_PLATFORM . '/platform.php';
-}
-
 // Import the library loader if necessary.
 if (!class_exists('JLoader'))
 {

diff --git a/libraries/platform.php → libraries/joomla/platform.php b/libraries/platform.php → libraries/joomla/platform.php