[phpBB] svn: r53 - trunk/phpbb2/patches

jeroen at wolffelaar.nl jeroen at wolffelaar.nl
Sun Feb 8 19:42:01 CET 2004


Author: jeroen
Date: 2004-02-08 19:41:36 +0100 (Sun, 08 Feb 2004)
New Revision: 53

Modified:
   trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff
Log:
Fix typo in autodetect-stuff

Modified: trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff
===================================================================
--- trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff	2004-02-08 18:22:39 UTC (rev 52)
+++ trunk/phpbb2/patches/010_sane_defaults_with_autodetection.diff	2004-02-08 18:41:36 UTC (rev 53)
@@ -1,6 +1,6 @@
 diff -ur phpBB2.orig/admin/admin_board.php phpBB2/admin/admin_board.php
 --- phpBB2.orig/admin/admin_board.php	2003-07-20 17:42:23.000000000 +0200
-+++ phpBB2/admin/admin_board.php	2004-02-08 18:56:25.000000000 +0100
++++ phpBB2/admin/admin_board.php	2004-02-08 19:24:18.000000000 +0100
 @@ -42,7 +42,7 @@
  	while( $row = $db->sql_fetchrow($result) )
  	{
@@ -12,8 +12,8 @@
  		$new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name];
 diff -ur phpBB2.orig/common.php phpBB2/common.php
 --- phpBB2.orig/common.php	2003-07-20 17:42:24.000000000 +0200
-+++ phpBB2/common.php	2004-02-08 18:46:02.000000000 +0100
-@@ -171,6 +171,30 @@
++++ phpBB2/common.php	2004-02-08 19:33:48.000000000 +0100
+@@ -171,6 +171,31 @@
  	$board_config[$row['config_name']] = $row['config_value'];
  }
  
@@ -29,10 +29,11 @@
 +	}
 +}
 +if (!$board_config['server_port']) {
-+	$board_config['server_name'] = $_SERVER['SERVER_PORT'];
++	$board_config['server_port'] = $_SERVER['SERVER_PORT'];
 +}
 +if (!$board_config['script_path']) {
-+	$board_config['script_path'] = preg_replace('#(?:admin/)[a-zA-Z0-9.]\\.php$#', '', $_SERVER['PHP_SELF']);
++	$board_config['script_path'] = ereg_replace('/admin/$', '/',
++		ereg_replace('/[^/]+$', '/', $_SERVER['PHP_SELF']));
 +}
 +if (!$board_config['board_email']) {
 +	$board_config['board_email'] = "webmaster@$board_config[server_name]";
@@ -44,7 +45,7 @@
  if (file_exists('install') || file_exists('contrib'))
  {
  	message_die(GENERAL_MESSAGE, 'Please ensure both the install/ and contrib/ directories are deleted');
-@@ -184,4 +208,4 @@
+@@ -184,4 +209,4 @@
  	message_die(GENERAL_MESSAGE, 'Board_disable', 'Information');
  }
  
@@ -53,7 +54,7 @@
 +?>
 diff -ur phpBB2.orig/install/schemas/mysql_basic.sql phpBB2/install/schemas/mysql_basic.sql
 --- phpBB2.orig/install/schemas/mysql_basic.sql	2003-07-20 17:27:29.000000000 +0200
-+++ phpBB2/install/schemas/mysql_basic.sql	2004-02-08 18:08:02.000000000 +0100
++++ phpBB2/install/schemas/mysql_basic.sql	2004-02-08 19:24:18.000000000 +0100
 @@ -5,9 +5,10 @@
  
  # -- Config





More information about the phpBB-l mailing list