Don't manually import JPlatform anymore

joomla · Jun 16, 2016 · 4be7a6a · 4be7a6a
1 parent 3c1c8df
commit 4be7a6a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1423,6 +1423,7 @@ public function deleteUnexistingFiles()
 			'/administrator/manifests/libraries/simplepie.xml',
 			'/administrator/templates/isis/js/jquery.js',
 			'/administrator/templates/isis/js/bootstrap.min.js',
+			'/libraries/platform.php',
 		);
 
 		// TODO There is an issue while deleting folders using the ftp mode

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