some changes based on michaels feedback

sakiss · Feb 24, 2017 · 33bddf5 · 33bddf5
1 parent cf28c74
commit 33bddf5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/administrator/includes/app.php b/administrator/includes/app.php
@@ -12,14 +12,14 @@
 $startTime = microtime(1);
 $startMem  = memory_get_usage();
 
-if (file_exists(__DIR__ . '/defines.php'))
+if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
-	include_once __DIR__ . '/defines.php';
+	include_once dirname(__DIR__) . '/defines.php';
 }
 
 if (!defined('_JDEFINES'))
 {
-	define('JPATH_BASE', __DIR__);
+	define('JPATH_BASE', dirname(__DIR__));
 	require_once JPATH_BASE . '/includes/defines.php';
 }
 

diff --git a/administrator/index.php b/administrator/index.php
@@ -22,7 +22,7 @@
 
 /**
  * Constant that is checked in included files to prevent direct access.
- * define() is used in the installation folder rather than "const" to not error for PHP 5.2 and lower
+ * define() is used rather than "const" to not error for PHP 5.2 and lower
  */
 define('_JEXEC', 1);
 

diff --git a/includes/app.php b/includes/app.php
@@ -12,14 +12,14 @@
 $startTime = microtime(1);
 $startMem  = memory_get_usage();
 
-if (file_exists(__DIR__ . '/defines.php'))
+if (file_exists(dirname(__DIR__) . '/defines.php'))
 {
-	include_once __DIR__ . '/defines.php';
+	include_once dirname(__DIR__) . '/defines.php';
 }
 
 if (!defined('_JDEFINES'))
 {
-	define('JPATH_BASE', __DIR__);
+	define('JPATH_BASE', dirname(__DIR__));
 	require_once JPATH_BASE . '/includes/defines.php';
 }
 

diff --git a/index.php b/index.php
@@ -22,7 +22,7 @@
 
 /**
  * Constant that is checked in included files to prevent direct access.
- * define() is used in the installation folder rather than "const" to not error for PHP 5.2 and lower
+ * define() is used rather than "const" to not error for PHP 5.2 and lower
  */
 define('_JEXEC', 1);
 

diff --git a/installation/application/app.php b/installation/application/app.php
@@ -3,18 +3,18 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 // Define the base path and require the other defines
 define('JPATH_BASE', __DIR__);
-require_once __DIR__ . '/application/defines.php';
+require_once __DIR__ . '/defines.php';
 
 // Launch the application
-require_once __DIR__ . '/application/framework.php';
+require_once __DIR__ . '/framework.php';
 
 // Check if the default log directory can be written to, add a logger for errors to use it
 if (is_writable(JPATH_ADMINISTRATOR . '/logs'))
@@ -33,7 +33,7 @@
 JLoader::registerPrefix('Installation', JPATH_INSTALLATION);
 
 // Register the application's router due to non-standard include
-JLoader::register('JRouterInstallation', __DIR__ . '/application/router.php');
+JLoader::register('JRouterInstallation', __DIR__ . '/router.php');
 
 // Instantiate the dependency injection container
 JFactory::$container = (new \Joomla\DI\Container)

diff --git a/installation/index.php b/installation/index.php
@@ -22,7 +22,7 @@
 
 /**
  * Constant that is checked in included files to prevent direct access.
- * define() is used in the installation folder rather than "const" to not error for PHP 5.2 and lower
+ * define() is used rather than "const" to not error for PHP 5.2 and lower
  */
 define('_JEXEC', 1);