Quam Plures

Merge lp:~edb/quam-plures/broken_installer_solution into lp:quam-plures

  1. broken_installer_solution
  2. Merge into trunk
Proposed by EdB
Status: Merged
Merged at revision: 7586
Proposed branch: lp:~edb/quam-plures/broken_installer_solution
Merge into: lp:quam-plures
Diff against target: 30 lines (+5/-5)
1 file modified
qp_install/index.php (+5/-5)
To merge this branch: bzr merge lp:~edb/quam-plures/broken_installer_solution
Reviewer Review Type Date Requested Status
Yabs (community) Approve
Review via email: mp+46402@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yabs (yabs) wrote :

Guess I should have done a test install last time :-S

¥

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qp_install/index.php'
2--- qp_install/index.php 2010-12-31 12:12:03 +0000
3+++ qp_install/index.php 2011-01-16 01:08:21 +0000
4@@ -293,10 +293,10 @@
5 $conf = preg_replace(
6 array(
7 '#\$app_db_config\s*=\s*array\(
8+ \s*[\'"]host[\'"]\s*=>\s*[\'"].*?[\'"], ([^\n\r]*\r?\n)
9+ \s*[\'"]name[\'"]\s*=>\s*[\'"].*?[\'"], ([^\n\r]*\r?\n)
10 \s*[\'"]user[\'"]\s*=>\s*[\'"].*?[\'"], ([^\n\r]*\r?\n)
11 \s*[\'"]password[\'"]\s*=>\s*[\'"].*?[\'"], ([^\n\r]*\r?\n)
12- \s*[\'"]name[\'"]\s*=>\s*[\'"].*?[\'"], ([^\n\r]*\r?\n)
13- \s*[\'"]host[\'"]\s*=>\s*[\'"].*?[\'"], ([^\n\r]*\r?\n)
14 #ixs',
15 "#app_db_tableprefix\s*=\s*'.*?';#",
16 "#app_baseurl\s*=\s*'.*?';#",
17@@ -304,10 +304,10 @@
18 ),
19 array(
20 "\$app_db_config = array(\n"
21+ ."\t'host' => '".str_replace( "'", "\'", $conf_db_host )."',\$4"
22+ ."\t'name' => '".str_replace( "'", "\'", $conf_db_name )."',\$3"
23 ."\t'user' => '".str_replace( "'", "\'", $conf_db_user )."',\$1"
24- ."\t'password' => '".str_replace( "'", "\'", $conf_db_password )."',\$2"
25- ."\t'name' => '".str_replace( "'", "\'", $conf_db_name )."',\$3"
26- ."\t'host' => '".str_replace( "'", "\'", $conf_db_host )."',\$4",
27+ ."\t'password' => '".str_replace( "'", "\'", $conf_db_password )."',\$2",
28 "app_db_tableprefix = '".str_replace( "'", "\'", $conf_db_tableprefix )."';",
29 "app_baseurl = '".str_replace( "'", "\'", $conf_baseurl )."';",
30 'app_config_is_done = 1;',

Subscribers

People subscribed via source and target branches