From b5b089670a796b2a6a510330bc081e42ddd937c2 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Wed, 12 Nov 2008 12:41:27 +0000
Subject: merge -c2863 from trunk to branch 2.0 - Remove advises of file
 removal at the end of install/upgrade. - Automatic change mysql.inc.php if
 file is writable, else purpose manual change to user.

git-svn-id: http://piwigo.org/svn/branches/2.0@2864 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 install/db/65-database.php | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

(limited to 'install/db')

diff --git a/install/db/65-database.php b/install/db/65-database.php
index c445b0ab6..6a26a1478 100644
--- a/install/db/65-database.php
+++ b/install/db/65-database.php
@@ -101,25 +101,6 @@ if ( !defined('PWG_CHARSET') )
 {
   $upgrade_log = '';
 
-// +-----------------------------------------------------------------------+
-// load the config file
-  $config_file = PHPWG_ROOT_PATH.'include/mysql.inc.php';
-  $config_file_contents = @file_get_contents($config_file);
-  if ($config_file_contents === false)
-  {
-    die('CANNOT LOAD '.$config_file);
-  }
-  $php_end_tag = strrpos($config_file_contents, '?'.'>');
-  if ($php_end_tag === false)
-  {
-    die('CANNOT FIND PHP END TAG IN '.$config_file);
-  }
-  if (!is_writable($config_file))
-  {
-    die('FILE NOT WRITABLE '.$config_file);
-  }
-
-
 // +-----------------------------------------------------------------------+
 // load all the user languages
   $all_langs=array();
@@ -274,17 +255,12 @@ ALTER TABLE t1 CHANGE c1 c1 TEXT CHARACTER SET utf8;
 
 
 // +-----------------------------------------------------------------------+
-// write the result to file and update #user_infos.language
-  $config_file_contents =
-    substr($config_file_contents, 0, $php_end_tag).'
-define(\'PWG_CHARSET\', \''.$pwg_charset.'\');
+// changes to write in mysql.inc.php
+  array_push($mysql_changes,
+'define(\'PWG_CHARSET\', \''.$pwg_charset.'\');
 define(\'DB_CHARSET\',  \''.$db_charset.'\');
-define(\'DB_COLLATE\',  \'\');
-'.substr($config_file_contents, $php_end_tag);
-
-  $fp = @fopen( $config_file, 'w' );
-  @fputs($fp, $config_file_contents, strlen($config_file_contents));
-  @fclose($fp);
+define(\'DB_COLLATE\',  \'\');'
+  );
 
   foreach ($all_langs as $old_lang=>$lang_data)
   {
-- 
cgit v1.2.3