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

Merge commit 'release-3.0.4'

Browse source
This commit is contained in:
Nils Adermann 2010-03-02 01:05:39 +01:00
commit 1f3498c0d6
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/constants.php
View file

@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
*/ */
// phpBB Version // phpBB Version
define('PHPBB_VERSION', '3.0.4-RC1'); define('PHPBB_VERSION', '3.0.4');
// QA-related // QA-related
// define('PHPBB_QA', 1); // define('PHPBB_QA', 1);

6
phpBB/includes/functions_content.php
View file

@ -1144,7 +1144,7 @@ function truncate_string($string, $max_length = 60, $max_store_length = 255, $al
/** /**
* Get username details for placing into templates. * Get username details for placing into templates.
* This function caches all modes on first call, except for no_profile - determined by $user_id/$guest_username combination. * This function caches all modes on first call, except for no_profile and anonymous user - determined by $user_id.
* *
* @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link) * @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link)
* @param int $user_id The users id * @param int $user_id The users id
@ -1161,10 +1161,10 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
static $_profile_cache; static $_profile_cache;
static $_base_profile_url; static $_base_profile_url;
$cache_key = $user_id . (string) $guest_username; $cache_key = $user_id;
// If the get_username_string() function had been executed once with an (to us) unkown mode, all modes are pre-filled and we can just grab it. // If the get_username_string() function had been executed once with an (to us) unkown mode, all modes are pre-filled and we can just grab it.
if (isset($_profile_cache[$cache_key][$mode])) if ($user_id && $user_id != ANONYMOUS && isset($_profile_cache[$cache_key][$mode]))
{ {
// If the mode is 'no_profile', we simply construct the TPL code due to calls to this mode being very very rare // If the mode is 'no_profile', we simply construct the TPL code due to calls to this mode being very very rare
if ($mode == 'no_profile') if ($mode == 'no_profile')

9
phpBB/install/database_update.php
View file

@ -8,7 +8,7 @@
* *
*/ */
$updates_to_version = '3.0.4-RC1'; $updates_to_version = '3.0.4';
// Return if we "just include it" to find out for which version the database update is responsible for // Return if we "just include it" to find out for which version the database update is responsible for
if (defined('IN_PHPBB') && defined('IN_INSTALL')) if (defined('IN_PHPBB') && defined('IN_INSTALL'))
@ -587,6 +587,9 @@ $database_update_info = array(
), ),
), ),
), ),
// Changes from 3.0.4-RC1 to 3.0.4
'3.0.4-RC1' => array(),
); );
// Determine mapping database type // Determine mapping database type
@ -2028,6 +2031,10 @@ function change_database_data(&$no_updates, $version)
$no_updates = false; $no_updates = false;
break; break;
// Changes from 3.0.4-RC1 to 3.0.4
case '3.0.4-RC1':
break;
} }
} }

2
phpBB/install/schemas/schema_data.sql
View file

@ -218,7 +218,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');