adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 1630: upgrade to Piwigo 2.1 :-)

Browse Source 
bug 1604: only activate core themes not all themes.

git-svn-id: http://piwigo.org/svn/trunk@5982 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-04-28 14:28:05 +00:00
parent aaa31653ee
commit 73db66afa5
11 changed files with 255 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install.php
+11 -35
View File
@@ -262,34 +262,8 @@ include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
if ( isset( $_POST['install'] ))
{
if ($pwg_db_link = install_db_connect($infos, $errors))
{
$required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
if ( version_compare(pwg_get_db_version(), $required_version, '>=') )
{
$pwg_charset = 'utf-8';
$pwg_db_charset = 'utf8';
if ($dblayer=='mysql')
{
$install_charset_collate = "DEFAULT CHARACTER SET $pwg_db_charset";
pwg_query('SET NAMES "'.$pwg_db_charset.'"');
}
else
{
$install_charset_collate = '';
}
}
else
{
$pwg_charset = 'iso-8859-1';
$pwg_db_charset = 'latin1';
$install_charset_collate = '';
if ( !array_key_exists($language, $languages->get_fs_languages($pwg_charset) ) )
{
$language='en_UK';
}
}
}
install_db_connect($infos, $errors);
pwg_db_check_charset();
$webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
if ( empty($webmaster))
@@ -320,8 +294,8 @@ $conf[\'db_host\'] = \''.$dbhost.'\';
$prefixeTable = \''.$prefixeTable.'\';
define(\'PHPWG_INSTALLED\', true);
define(\'PWG_CHARSET\', \''.$pwg_charset.'\');
define(\'DB_CHARSET\', \''.$pwg_db_charset.'\');
define(\'PWG_CHARSET\', \'utf-8\');
define(\'DB_CHARSET\', \'utf8\');
define(\'DB_COLLATE\', \'\');
?'.'>';
@@ -350,13 +324,15 @@ define(\'DB_COLLATE\', \'\');
execute_sqlfile(
PHPWG_ROOT_PATH.'install/piwigo_structure-'.$dblayer.'.sql',
DEFAULT_PREFIX_TABLE,
$prefixeTable
$prefixeTable,
$dblayer
);
// We fill the tables with basic informations
execute_sqlfile(
PHPWG_ROOT_PATH.'install/config.sql',
DEFAULT_PREFIX_TABLE,
$prefixeTable
$prefixeTable,
$dblayer
);
$query = '
@@ -366,7 +342,7 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
pwg_query($query);
// fill languages table
foreach ($languages->get_fs_languages($pwg_charset) as $language_code => $language_name)
foreach ($languages->get_fs_languages() as $language_code => $language_name)
{
$languages->perform_action('activate', $language_code);
}
@@ -378,9 +354,9 @@ INSERT INTO '.$prefixeTable.'config (param,value,comment)
// themes class
if (!defined('PWG_CHARSET'))
{
define('PWG_CHARSET', $pwg_charset);
define('PWG_CHARSET', 'utf-8');
}
activate_all_themes();
activate_core_themes();
$insert = array(
'id' => 1,