[Joomla-commits] r22968 - in development/trunk: administrator/includes includes

[githu...@jcode001.directrouter.com]

Author: github_bot
Date: 2012-04-02 09:16:31 -0500 (Mon, 02 Apr 2012)
New Revision: 22968

Modified:
development/trunk/administrator/includes/framework.php
development/trunk/includes/framework.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/administrator/includes/framework.php
===================================================================
--- development/trunk/administrator/includes/framework.php 2012-04-02 13:56:28 UTC (rev 22967)
+++ development/trunk/administrator/includes/framework.php 2012-04-02 14:16:31 UTC (rev 22968)
@@ -19,7 +19,7 @@
/*
* Installation check, and check on removal of the install directory.
*/
-if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php')) {
+if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/) {
header('Location: ../installation/index.php');
exit();
}

Modified: development/trunk/includes/framework.php
===================================================================
--- development/trunk/includes/framework.php 2012-04-02 13:56:28 UTC (rev 22967)
+++ development/trunk/includes/framework.php 2012-04-02 14:16:31 UTC (rev 22968)
@@ -20,7 +20,7 @@
// Installation check, and check on removal of the install directory.
//

-if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) || file_exists(JPATH_INSTALLATION.'/index.php')) {
+if (!file_exists(JPATH_CONFIGURATION.'/configuration.php') || (filesize(JPATH_CONFIGURATION.'/configuration.php') < 10) /*|| file_exists(JPATH_INSTALLATION.'/index.php')*/) {

if (file_exists(JPATH_INSTALLATION.'/index.php')) {
header('Location: '.substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')).'installation/index.php');

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits