aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-03-26 16:49:23 +0000
committerpatdenice <patdenice@piwigo.org>2010-03-26 16:49:23 +0000
commit7b25308e7392a028dc7573d6593e398748534b1a (patch)
tree8025734ab4d72c403dba275c9c742eacad2ac224 /admin/include
parentb9978b0ad3e1eee137e5c051834ee9f0dde0ace0 (diff)
Fix php5 apache configuration with upgrade.
git-svn-id: http://piwigo.org/svn/trunk@5387 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions_install.inc.php2
-rw-r--r--admin/include/functions_upgrade.php17
2 files changed, 18 insertions, 1 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php
index d55f4e057..9aab979c6 100644
--- a/admin/include/functions_install.inc.php
+++ b/admin/include/functions_install.inc.php
@@ -139,7 +139,7 @@ function activate_all_themes()
}
}
-function try_db_connection(&$infos, &$errors)
+function install_db_connect(&$infos, &$errors)
{
try
{
diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index b35b4c8e6..644e5ffd7 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -66,6 +66,8 @@ function prepare_conf_upgrade()
define('IMAGE_TAG_TABLE', $prefixeTable.'image_tag');
define('PLUGINS_TABLE', $prefixeTable.'plugins');
define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');
+ define('THEMES_TABLE', $prefixeTable.'themes');
+ define('LANGUAGES_TABLE', $prefixeTable.'languages');
}
// Deactivate all non-standard plugins
@@ -213,4 +215,19 @@ SELECT id
return (count(array_diff($existing, $applied)) > 0);
}
+function upgrade_db_connect()
+{
+ global $conf;
+
+ try
+ {
+ $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
+ $conf['db_password'], $conf['db_base']);
+ }
+ catch (Exception $e)
+ {
+ my_error(l10n($e->getMessage()), true);
+ }
+}
+
?> \ No newline at end of file