makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Using a different approach for the data updates (same as the schema updates)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6671 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-11-27 16:05:23 +00:00
parent 22c729c41b
commit 688ef7560a
3 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -687,7 +687,7 @@ function tz_select($default = '', $truncate = false)
if ($truncate) if ($truncate)
{ {
$zone_trunc = truncate_string($zone, 50, false, '...'); $zone_trunc = truncate_string($zone, 50, false, '...');
} }
else else
{ {
$zone_trunc = $zone; $zone_trunc = $zone;

2
phpBB/includes/ucp/ucp_prefs.php
View file

@ -130,7 +130,7 @@ class ucp_prefs
'S_LANG_OPTIONS' => language_select($data['lang']), 'S_LANG_OPTIONS' => language_select($data['lang']),
'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']), 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']),
'S_TZ_OPTIONS' => tz_select($data['tz'], true), 'S_TZ_OPTIONS' => tz_select($data['tz'], true),
'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false, 'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false,
'S_SELECT_NOTIFY' => ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false) 'S_SELECT_NOTIFY' => ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
); );

43
phpBB/install/database_update.php
View file

@ -308,7 +308,7 @@ $database_update_info = array(
), ),
), ),
// Latest version // Latest version
'3.0.b4-dev' => array(), '3.0.b4' => array(),
); );
// Determine mapping database type // Determine mapping database type
@ -458,34 +458,29 @@ $errored = $no_updates = false;
flush(); flush();
$no_updates = true;
// some code magic // some code magic
switch ($current_version) if (version_compare($current_version, '3.0.b3', '<'))
{ {
case '3.0.b3': // Set group_founder_manage for administrators group
// Set group_founder_manage for administrators group $sql = 'SELECT group_id
$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . "
FROM ' . GROUPS_TABLE . " WHERE group_name = 'ADMINISTRATORS'
WHERE group_name = 'ADMINISTRATORS' AND group_type = " . GROUP_SPECIAL;
AND group_type = " . GROUP_SPECIAL; $result = $db->sql_query($sql);
$result = $db->sql_query($sql); $group_id = (int) $db->sql_fetchfield('group_id');
$group_id = (int) $db->sql_fetchfield('group_id'); $db->sql_freeresult($result);
$db->sql_freeresult($result);
if ($group_id) if ($group_id)
{ {
$sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_founder_manage = 1 WHERE group_id = ' . $group_id; $sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_founder_manage = 1 WHERE group_id = ' . $group_id;
_sql($sql, $errored, $error_ary); _sql($sql, $errored, $error_ary);
} }
add_bots(); add_bots();
// No need to change here. Before this line, no break should appear $no_updates = false;
break;
case '3.0.b4-dev':
default:
$no_updates = true;
break;
} }
_write_result($no_updates, $errored, $error_ary); _write_result($no_updates, $errored, $error_ary);