1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 02:36:38 +02:00

Remove caching of templates from the database completely, themes is cut down ready for a complete chop, and fix the installer :)

git-svn-id: file:///svn/phpbb/trunk@8812 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith
2008-09-04 11:39:25 +00:00
parent f2abefeaed
commit 0dbe7e3b6c
13 changed files with 36 additions and 395 deletions

View File

@@ -273,9 +273,6 @@ $config = array(
$template->set_custom_template('../adm/style', 'admin');
$template->assign_var('T_TEMPLATE_PATH', '../adm/style');
// the acp template is never stored in the database
$user->theme['template_storedb'] = false;
$install = new module();
$install->create('install', 'index.' . PHP_EXT, $mode, $sub);

View File

@@ -1955,7 +1955,7 @@ class install_install extends module
'TITLE' => $lang['INSTALL_CONGRATS'],
'BODY' => sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid('install/index', 'mode=convert&language=' . $data['language']), '../docs/README.html'),
'L_SUBMIT' => $lang['INSTALL_LOGIN'],
'U_ACTION' => append_sid(CONFIG_ADM_FOLDER . '/index'),
'U_ACTION' => append_sid('adm/index'),
));
}

View File

@@ -128,9 +128,6 @@ class install_update extends module
// Set custom template again. ;)
$template->set_custom_template('../adm/style', 'admin');
// still, the acp template is never stored in the database
$user->theme['template_storedb'] = false;
// Get current and latest version
if (($latest_version = $cache->get('_version_info')) === false)
{

View File

@@ -808,7 +808,6 @@ $schema_data['phpbb_styles_template'] = array(
'template_copyright' => array('VCHAR_UNI', ''),
'template_path' => array('VCHAR:100', ''),
'bbcode_bitfield' => array('VCHAR:255', 'kNg='),
'template_storedb' => array('BOOL', 0),
),
'PRIMARY_KEY' => 'template_id',
'KEYS' => array(
@@ -816,20 +815,6 @@ $schema_data['phpbb_styles_template'] = array(
),
);
$schema_data['phpbb_styles_template_data'] = array(
'COLUMNS' => array(
'template_id' => array('USINT', 0),
'template_filename' => array('VCHAR:100', ''),
'template_included' => array('TEXT', ''),
'template_mtime' => array('TIMESTAMP', 0),
'template_data' => array('MTEXT_UNI', ''),
),
'KEYS' => array(
'tid' => array('INDEX', 'template_id'),
'tfn' => array('INDEX', 'template_filename'),
),
);
$schema_data['phpbb_styles_theme'] = array(
'COLUMNS' => array(
'theme_id' => array('USINT', NULL, 'auto_increment'),

View File

@@ -467,7 +467,7 @@ INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang,
INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_unread', 'subforum_unread.gif', '', 9, 11, 1);
# -- phpbb_styles_template
INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('prosilver', '© phpBB Group', 'prosilver', 'lNg=', 0);
INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield) VALUES ('prosilver', '© phpBB Group', 'prosilver', 'lNg=');
# -- phpbb_styles_theme
INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_storedb, theme_data) VALUES ('prosilver', '© phpBB Group', 'prosilver', 1, '');