diff options
| author | patdenice <patdenice@piwigo.org> | 2008-11-12 13:50:38 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2008-11-12 13:50:38 +0000 |
| commit | 9a0aab2515effe084c8bce85826a8e04a271a93b (patch) | |
| tree | 354ddd694f3161a436a6e89e0a8c4e2bb99dc031 /upgrade.php | |
| parent | b5b089670a796b2a6a510330bc081e42ddd937c2 (diff) | |
merge -c2865 from trunk to branch 2.0
- Remove advises of file removal at the end of install (forgotten in last commit!)
git-svn-id: http://piwigo.org/svn/branches/2.0@2866 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'upgrade.php')
| -rw-r--r-- | upgrade.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/upgrade.php b/upgrade.php index 1255f0623..073030592 100644 --- a/upgrade.php +++ b/upgrade.php @@ -253,14 +253,14 @@ if (isset($_POST['submit']) and check_upgrade()) { $config_file_contents = substr($config_file_contents, 0, $php_end_tag) . "\r\n" - . implode("\r\n\r\n" , $mysql_changes) . "\r\n" + . implode("\r\n" , $mysql_changes) . "\r\n" . substr($config_file_contents, $php_end_tag); if (!@file_put_contents($config_file, $config_file_contents)) { array_push($page['infos'], l10n('in include/mysql.inc.php, before ?>, insert:') . ' -<p><textarea rows="5" cols="40">'.implode("\r\n\r\n" , $mysql_changes).'</textarea></p>' +<p><textarea rows="4" cols="40">'.implode("\r\n" , $mysql_changes).'</textarea></p>' ); } } |