From 3999bff326758306f1434408466d138566c4422f Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 28 Jun 2019 11:21:18 +0200 Subject: [PATCH] fixes #1042 set Modus as default theme --- admin/include/functions_install.inc.php | 2 +- include/constants.php | 5 ++++- install/piwigo_structure-mysql.sql | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php index a8707634e0..f667545b16 100644 --- a/admin/include/functions_install.inc.php +++ b/admin/include/functions_install.inc.php @@ -65,7 +65,7 @@ function activate_core_themes() $themes = new themes(); foreach ($themes->fs_themes as $theme_id => $fs_theme) { - if (in_array($theme_id, array('elegant', 'smartpocket'))) + if (in_array($theme_id, array('modus', 'smartpocket'))) { $themes->perform_action('activate', $theme_id); } diff --git a/include/constants.php b/include/constants.php index 63d4d4174b..062a592173 100644 --- a/include/constants.php +++ b/include/constants.php @@ -9,7 +9,10 @@ // Default settings define('PHPWG_VERSION', '2.10.0beta1'); define('PHPWG_DEFAULT_LANGUAGE', 'en_UK'); -define('PHPWG_DEFAULT_TEMPLATE', 'elegant'); +// this constant is actually never used, the true default theme is the theme or user "guest", +// which is initialized with column user_infos.theme default value +// (see file install/piwigo_structure-mysql.sql) +define('PHPWG_DEFAULT_TEMPLATE', 'modus'); define('PHPWG_THEMES_PATH', $conf['themes_dir'].'/'); defined('PWG_COMBINED_DIR') or define('PWG_COMBINED_DIR', $conf['data_location'].'combined/'); diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql index 22d5ba706d..a65db2f451 100644 --- a/install/piwigo_structure-mysql.sql +++ b/install/piwigo_structure-mysql.sql @@ -474,7 +474,7 @@ CREATE TABLE `piwigo_user_infos` ( `show_nb_comments` enum('true','false') NOT NULL default 'false', `show_nb_hits` enum('true','false') NOT NULL default 'false', `recent_period` tinyint(3) unsigned NOT NULL default '7', - `theme` varchar(255) NOT NULL default 'elegant', + `theme` varchar(255) NOT NULL default 'modus', `registration_date` datetime NOT NULL default '1970-01-01 00:00:00', `enabled_high` enum('true','false') NOT NULL default 'true', `level` tinyint unsigned NOT NULL default '0',