SOURCES: joomla-install.patch - up to 1.0.12

[rotom]

Author: rotom                        Date: Thu Apr  5 20:16:54 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 1.0.12

---- Files affected:
SOURCES:
   joomla-install.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/joomla-install.patch
diff -u SOURCES/joomla-install.patch:1.2 SOURCES/joomla-install.patch:1.3
--- SOURCES/joomla-install.patch:1.2	Wed Jul  5 12:04:38 2006
+++ SOURCES/joomla-install.patch	Thu Apr  5 22:16:49 2007
@@ -1,46 +1,46 @@
---- joomla-1.0.10/administrator/index.php.orig	2006-06-25 22:54:08.000000000 +0200
-+++ joomla-1.0.10/administrator/index.php	2006-07-05 11:39:36.000000000 +0200
-@@ -24,11 +24,11 @@
- include_once ( $mosConfig_absolute_path . '/language/'. $mosConfig_lang .'.php' );
+--- joomla-1.0.12/index.php.orig	2006-12-24 21:21:24.000000000 +0100
++++ joomla-1.0.12/index.php	2007-04-05 20:42:43.000000000 +0200
+@@ -33,11 +33,11 @@
+ require_once( 'includes/joomla.php' );
  
  //Installation sub folder check, removed for work with SVN
--if (file_exists( '../installation/index.php' ) && $_VERSION->SVN == 0) {
+-if (file_exists( 'installation/index.php' ) && $_VERSION->SVN == 0) {
 -	define( '_INSTALL_CHECK', 1 );
--	include ($mosConfig_absolute_path .'/offline.php');
+-	include ( $mosConfig_absolute_path .'/offline.php');
 -	exit();
 -}
-+//if (file_exists( '../installation/index.php' ) && $_VERSION->SVN == 0) {
++//if (file_exists( 'installation/index.php' ) && $_VERSION->SVN == 0) {
 +//	define( '_INSTALL_CHECK', 1 );
-+//	include ($mosConfig_absolute_path .'/offline.php');
++//	include ( $mosConfig_absolute_path .'/offline.php');
 +//	exit();
 +//}
  
- $option = strtolower( strval( mosGetParam( $_REQUEST, 'option', NULL ) ) );
- 
---- joomla-1.0.10/index.php.orig	2006-06-25 22:54:18.000000000 +0200
-+++ joomla-1.0.10/index.php	2006-07-05 11:43:26.000000000 +0200
-@@ -26,11 +26,11 @@
- require_once( 'includes/joomla.php' );
+ // displays offline/maintanance page or bar
+ if ($mosConfig_offline == 1) {
+--- joomla-1.0.12/administrator/index.php.orig	2006-12-24 21:20:50.000000000 +0100
++++ joomla-1.0.12/administrator/index.php	2007-04-05 20:42:43.000000000 +0200
+@@ -32,11 +32,11 @@
+ include_once ( $mosConfig_absolute_path . '/language/'. $mosConfig_lang .'.php' );
  
  //Installation sub folder check, removed for work with SVN
--if (file_exists( 'installation/index.php' ) && $_VERSION->SVN == 0) {
+-if (file_exists( '../installation/index.php' ) && $_VERSION->SVN == 0) {
 -	define( '_INSTALL_CHECK', 1 );
--	include ( $mosConfig_absolute_path .'/offline.php');
+-	include ($mosConfig_absolute_path .'/offline.php');
 -	exit();
 -}
-+//if (file_exists( 'installation/index.php' ) && $_VERSION->SVN == 0) {
++//if (file_exists( '../installation/index.php' ) && $_VERSION->SVN == 0) {
 +//	define( '_INSTALL_CHECK', 1 );
-+//	include ( $mosConfig_absolute_path .'/offline.php');
++//	include ($mosConfig_absolute_path .'/offline.php');
 +//	exit();
 +//}
  
- // displays offline/maintanance page or bar
- if ($mosConfig_offline == 1) {
---- joomla-1.0.10/installation/index.php.orig	2006-07-05 11:46:36.000000000 +0200
-+++ joomla-1.0.10/installation/index.php	2006-07-05 11:46:55.000000000 +0200
-@@ -11,10 +11,10 @@
- * See COPYRIGHT.php for copyright notices and details.
- */
+ $option = strtolower( strval( mosGetParam( $_REQUEST, 'option', NULL ) ) );
+ 
+--- joomla-1.0.12/installation/index.php.orig	2006-12-24 21:21:26.000000000 +0100
++++ joomla-1.0.12/installation/index.php	2007-04-05 20:43:09.000000000 +0200
+@@ -14,10 +14,10 @@
+ // Set flag that this is a parent file
+ define( '_VALID_MOS', 1 );
  
 -if (file_exists( '../configuration.php' ) && filesize( '../configuration.php' ) > 10) {
 -	header( "Location: ../index.php" );
@@ -50,14 +50,14 @@
 +//	header( "Location: ../index.php" );
 +//	exit();
 +//}
+ require( '../globals.php' );
  require_once( '../includes/version.php' );
  
- /** Include common.php */
---- joomla-1.0.10/installation/install.php.orig	2006-07-05 11:51:19.000000000 +0200
-+++ joomla-1.0.10/installation/install.php	2006-07-05 11:51:40.000000000 +0200
-@@ -11,10 +11,10 @@
- * See COPYRIGHT.php for copyright notices and details.
- */
+--- joomla-1.0.12/installation/install.php.orig	2006-12-24 21:21:26.000000000 +0100
++++ joomla-1.0.12/installation/install.php	2007-04-05 20:42:43.000000000 +0200
+@@ -14,10 +14,10 @@
+ // Set flag that this is a parent file
+ define( "_VALID_MOS", 1 );
  
 -if (file_exists( '../configuration.php' ) && filesize( '../configuration.php' ) > 10) {
 -	header( 'Location: ../index.php' );
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/joomla-install.patch?r1=1.2&r2=1.3&f=u