head	1.2;
access;
symbols
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_HEAD:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.07.29.11.53.29;	author rse;	state Exp;
branches;
next	1.1;
commitid	8bgOaXzF6zxcQErs;

1.1
date	2006.12.25.10.16.23;	author rse;	state Exp;
branches;
next	;
commitid	TLpeAohQIOklfTZr;


desc
@@


1.2
log
@upgrading package: phpbb 3.0.RC3 -> 3.0.RC4
@
text
@Index: install/install_install.php
--- install/install_install.php.orig	2007-07-28 18:48:13 +0200
+++ install/install_install.php	2007-07-29 13:52:26 +0200
@@@@ -392,7 +392,7 @@@@
 		if (empty($magic_home))
 		{
 			$locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/');
-			$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH'))));
+			$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', '@@l_prefix@@/bin:' . getenv('PATH'))));
 
 			$locations = array_merge($path_locations, $locations);
 			foreach ($locations as $location)
@@@@ -604,6 +604,7 @@@@
 			$available_dbms = &$available_dbms_temp;
 
 			// And now for the main part of this page
+ 			$dbhost = (!empty($dbhost) ? $dbhost : '@@l_prefix@@/var/phpbb/db/phpbb.db');
 			$data['table_prefix'] = (!empty($data['table_prefix']) ? $data['table_prefix'] : 'phpbb_');
 
 			foreach ($this->db_config_options as $config_key => $vars)
@


1.1
log
@new package: phpbb 3.0.B4 (Web Bulletin Board System (BBS))
@
text
@d2 3
a4 3
--- install/install_install.php.orig	2006-11-27 22:47:53 +0100
+++ install/install_install.php	2006-12-25 10:37:55 +0100
@@@@ -287,7 +287,7 @@@@
d13 2
a14 2
@@@@ -508,6 +508,7 @@@@
 			$this->available_dbms = &$available_dbms_temp;
d17 2
a18 2
+			$dbhost = (!empty($dbhost) ? $dbhost : '@@l_prefix@@/var/phpbb/db/phpbb.db');
 			$table_prefix = (!empty($table_prefix) ? $table_prefix : 'phpbb_');
@