This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.
- This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.0 you should select the phpBB-3.0.0_to_3.0.1.zip/tar.gz file.
+ This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.2 you should select the phpBB-3.0.2_to_3.0.3.zip/tar.gz file.
The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.
@@ -285,7 +285,7 @@
The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the Automatic update package explained below. It is also the preferred update method.
- A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.0 you need the phpBB-3.0.0_to_3.0.1.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.
+ A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.2 you need the phpBB-3.0.2_to_3.0.3.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.
-
-
General things
+
3.i. Style Config Files
+
Style cfg files are simple name-value lists with the information necessary for installing a style. Similar cfg files exist for templates, themes and imagesets. These follow the same principle and will not be introduced individually. Styles can use installed components by using the required_theme/required_template/required_imageset entries. The important part of the style configuration file is assigning an unique name.
+
+ # General Information about this style
+ name = prosilver_duplicate
+ copyright = © phpBB Group, 2007
+ version = 3.0.3
+ required_template = prosilver
+ required_theme = prosilver
+ required_imageset = prosilver
+
+
3.2. General Styling Rules
Templates should be produced in a consistent manner. Where appropriate they should be based off an existing copy, e.g. index, viewforum or viewtopic (the combination of which implement a range of conditional and variable forms). Please also note that the intendation and coding guidelines also apply to templates where possible.
The outer table class forumline has gone and is replaced with tablebg.
@@ -1069,6 +1079,8 @@ append_sid('memberlist', 'mode=group&g=' . $row['group_id'])
+
4.i. General Templating
+
File naming
Firstly templates now take the suffix ".html" rather than ".tpl". This was done simply to make the lifes of some people easier wrt syntax highlighting, etc.
@@ -1456,6 +1468,29 @@ div
</fieldset>
</form>
+
+
4.ii. Template Inheritance
+
When basing a new template on an existing one, it is not necessary to provide all template files. By declaring the template to be "inheriting " in the template configuration file.
+
+
The limitation on this is that the base style has to be installed and complete, meaning that it is not itself inheriting.
+
+
The effect of doing so is that the template engine will use the files in the new template where they exist, but fall back to files in the base template otherwise. Declaring a style to be inheriting also causes it to use some of the configuration settings of the base style, notably database storage.
+
+
We strongly encourage the use of inheritance for styles based on the bundled styles, as it will ease the update procedure.
+
+
+ # General Information about this template
+ name = inherits
+ copyright = © phpBB Group, 2007
+ version = 3.0.3
+
+ # Defining a different template bitfield
+ template_bitfield = lNg=
+
+ # Are we inheriting?
+ inherit_from = prosilver
+
+
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 62d30f8018..e0e99d4153 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -84,6 +84,11 @@ class acm
@flock($fp, LOCK_UN);
fclose($fp);
+ if (!function_exists('phpbb_chmod'))
+ {
+ include(PHPBB_ROOT_PATH . 'includes/functions.' . PHP_EXT);
+ }
+
phpbb_chmod($this->cache_dir . 'data_global.' . PHP_EXT, CHMOD_WRITE);
}
else
@@ -182,6 +187,11 @@ class acm
@flock($fp, LOCK_UN);
fclose($fp);
+ if (!function_exists('phpbb_chmod'))
+ {
+ include(PHPBB_ROOT_PATH . 'includes/functions.' . PHP_EXT);
+ }
+
phpbb_chmod($this->cache_dir . "data{$var_name}." . PHP_EXT, CHMOD_WRITE);
}
}
@@ -392,6 +402,11 @@ class acm
@flock($fp, LOCK_UN);
fclose($fp);
+ if (!function_exists('phpbb_chmod'))
+ {
+ include(PHPBB_ROOT_PATH . 'includes/functions.' . PHP_EXT);
+ }
+
phpbb_chmod($filename, CHMOD_WRITE);
$query_result = $query_id;
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 3b53d51417..7b866e3c36 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -768,6 +768,8 @@ class acp_attachments
$s_forum_id_options = '';
+ /** @todo use in-built function **/
+
$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
FROM ' . FORUMS_TABLE . '
ORDER BY left_id ASC';
@@ -798,7 +800,7 @@ class acp_attachments
}
else if ($row['left_id'] > $right + 1)
{
- $padding = $padding_store[$row['parent_id']];
+ $padding = empty($padding_store[$row['parent_id']]) ? '' : $padding_store[$row['parent_id']];
}
$right = $row['right_id'];
@@ -1171,7 +1173,7 @@ class acp_attachments
$location .= '/';
}
- if (@is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)
+ if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)
{
$imagick = str_replace('\\', '/', $location);
continue;
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 1680dacfda..cae2c30433 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -87,7 +87,7 @@ class acp_groups
// Approve, demote or promote
$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
$error = group_user_attributes($action, $group_id, $mark_ary, false, $group_name);
-
+
if (!$error)
{
switch ($action)
@@ -111,7 +111,7 @@ class acp_groups
{
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING);
}
-
+
break;
case 'default':
@@ -179,7 +179,7 @@ class acp_groups
case 'deleteusers':
case 'delete':
- if (!$group_id)
+ if (!$group_id)
{
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
}
@@ -187,6 +187,7 @@ class acp_groups
{
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
+
if (confirm_box(true))
{
$error = '';
@@ -751,14 +752,14 @@ class acp_groups
foreach ($row_ary as $group_id => $row)
{
$group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name'];
-
+
$template->assign_block_vars('groups', array(
'U_LIST' => "{$this->u_action}&action=list&g=$group_id",
'U_EDIT' => "{$this->u_action}&action=edit&g=$group_id",
'U_DELETE' => ($auth->acl_get('a_groupdel')) ? "{$this->u_action}&action=delete&g=$group_id" : '',
'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false,
-
+
'GROUP_NAME' => $group_name,
'TOTAL_MEMBERS' => $row['total_members'],
)
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index caaeb31404..3e66f49afa 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -483,7 +483,8 @@ class acp_main
if (!defined('PHPBB_DISABLE_CONFIG_CHECK') && file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && is_writable(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
{
- $template->assign_var('S_WRITABLE_CONFIG', true);
+ // World-Writable? (000x)
+ $template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) & 0x0002));
}
$this->tpl_name = 'acp_main';
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index e205b15892..b2389da3d4 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -688,7 +688,7 @@ parse_css_file = {PARSE_CSS_FILE}
}
fwrite($fp, $template_data);
fclose($fp);
-
+
// destroy the cached version of the template (filename without extension)
$this->clear_template_cache($template_info, array(substr($template_file, 0, -5)));
@@ -826,7 +826,7 @@ parse_css_file = {PARSE_CSS_FILE}
trigger_error($user->lang['TEMPLATE_CACHE_CLEARED'] . adm_back_link($this->u_action . "&action=cache&id=$template_id"));
}
- $cache_prefix = 'tpl_' . $template_row['template_path'];
+ $cache_prefix = 'tpl_' . str_replace('_', '-', $template_row['template_path']);
// Someone wants to see the cached source ... so we'll highlight it,
// add line numbers and indent it appropriately. This could be nasty
@@ -1638,7 +1638,6 @@ parse_css_file = {PARSE_CSS_FILE}
if ($mode == 'template' || $inc_template)
{
$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version']), $this->template_cfg);
- $template_cfg .= "\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";
$data[] = array(
'src' => $template_cfg,
@@ -2193,7 +2192,7 @@ parse_css_file = {PARSE_CSS_FILE}
{
global $user;
- $cache_prefix = 'tpl_' . $template_path;
+ $cache_prefix = 'tpl_' . str_replace('_', '-', $template_path);
if (!($dp = @opendir(PHPBB_ROOT_PATH . 'cache')))
{
@@ -2229,7 +2228,7 @@ parse_css_file = {PARSE_CSS_FILE}
{
global $user;
- $cache_prefix = 'tpl_' . $template_row['template_path'];
+ $cache_prefix = 'tpl_' . str_replace('_', '-', $template_row['template_path']);
if (!$file_ary || !is_array($file_ary))
{
@@ -3069,4 +3068,4 @@ parse_css_file = {PARSE_CSS_FILE}
}
}
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index eb7d5815a3..e99f70f153 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3547,9 +3547,6 @@ function page_header($page_title = '', $display_online_list = true)
'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false,
'S_REGISTERED_USER' => (!empty($user->data['is_registered'])) ? true : false,
'S_IS_BOT' => (!empty($user->data['is_bot'])) ? true : false,
- 'S_IN_SEARCH' => false,
- 'S_VIEWTOPIC' => false,
- 'S_VIEWFORUM' => false,
'S_USER_PM_POPUP' => $user->optionget('popuppm'),
'S_USER_LANG' => $user_lang,
'S_USER_BROWSER' => (isset($user->data['session_browser'])) ? $user->data['session_browser'] : $user->lang['UNKNOWN_BROWSER'],
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index de8b031b68..73206839b7 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -691,7 +691,7 @@ class queue
if ($fp = @fopen($this->cache_file, 'wb'))
{
@flock($fp, LOCK_EX);
- fwrite($fp, "queue_data = " . var_export($this->queue_data, true) . ";\n?>");
+ fwrite($fp, "queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>");
@flock($fp, LOCK_UN);
fclose($fp);
@@ -732,7 +732,7 @@ class queue
if ($fp = @fopen($this->cache_file, 'w'))
{
@flock($fp, LOCK_EX);
- fwrite($fp, "queue_data = " . var_export($this->data, true) . ";\n?>");
+ fwrite($fp, "queue_data = unserialize(" . var_export(serialize($this->data), true) . ");\n\n?>");
@flock($fp, LOCK_UN);
fclose($fp);
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 9e0ff6c02a..814d6d2e50 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -67,7 +67,7 @@ class template
public function set_custom_template($template_path, $template_name)
{
$this->root = $template_path;
- $this->cachepath = PHPBB_ROOT_PATH . 'cache/ctpl_' . $template_name . '_';
+ $this->cachepath = PHPBB_ROOT_PATH . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
return true;
}
@@ -174,7 +174,7 @@ class template
}
else
{
- // if we could not eval AND the file exists, something horrific has occured
+ // if we could not eval AND the file exists, something horrific has occured
return false;
}
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 89cdd5c640..0df9ba2707 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -418,6 +418,26 @@ function compose_pm($id, $mode, $action)
$max_recipients = (!$max_recipients) ? $config['pm_max_recipients'] : $max_recipients;
+ // If this is a quote/reply "to all"... we may increase the max_recpients to the number of original recipients
+ if (($action == 'reply' || $action == 'quote') && $max_recipients)
+ {
+ // We try to include every previously listed member from the TO Header
+ $list = rebuild_header(array('to' => $post['to_address']));
+
+ // Can be an empty array too ;)
+ $list = (!empty($list['u'])) ? $list['u'] : array();
+ $list[$post['author_id']] = 'to';
+
+ if (isset($list[$user->data['user_id']]))
+ {
+ unset($list[$user->data['user_id']]);
+ }
+
+ $max_recipients = ($max_recipients < sizeof($list)) ? sizeof($list) : $max_recipients;
+
+ unset($list);
+ }
+
// Handle User/Group adding/removing
handle_message_list_actions($address_list, $error, $remove_u, $remove_g, $add_to, $add_bcc);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 3b62abacb0..d7dbad94b6 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -32,7 +32,7 @@ unset($dbpasswd);
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.2',
- 'phpbb_version' => '3.0.2',
+ 'phpbb_version' => '3.0.3',
'author' => '
phpBB Group ',
'dbms' => $dbms,
'dbhost' => $dbhost,
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b0b6efe62c..e43e8ad142 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
*
*/
-$updates_to_version = '3.0.3-RC1';
+$updates_to_version = '3.0.3';
// Return if we "just include it" to find out for which version the database update is responsuble for
if (defined('IN_PHPBB') && defined('IN_INSTALL'))
@@ -78,7 +78,7 @@ if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
}
else
{
- set_magic_quotes_runtime(0);
+ @set_magic_quotes_runtime(0);
define('STRIP', (get_magic_quotes_gpc()) ? true : false);
}
@@ -340,6 +340,9 @@ $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
// Only an example, but also commented out
$database_update_info = array(
+
+ // No changes from 3.0.3-RC1 to 3.0.3
+ '3.0.3-RC1' => array(),
);
// Determine mapping database type
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index faf569482f..fce0350c31 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -418,7 +418,7 @@ class install_install extends module
$location .= '/';
}
- if (@is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)
+ if (@file_exists($location) && @is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000)
{
$img_imagick = str_replace('\\', '/', $location);
continue;
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 4b13d62ace..2d28b4fb2a 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -166,7 +166,7 @@ $lang = array_merge($lang, array(
'IMG_FORUM_UNREAD_SUBFORUM' => 'Subforum new posts',
'IMG_SUBFORUM_READ' => 'Legend subforum',
'IMG_SUBFORUM_UNREAD' => 'Legend subforum new posts',
-
+
'IMG_TOPIC_MOVED' => 'Topic moved',
'IMG_TOPIC_READ' => 'Topic',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7c8de35264..f6d009b5dd 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -260,7 +260,7 @@ $lang = array_merge($lang, array(
'HOME' => 'Home',
'ICQ' => 'ICQ',
- 'ICQ_STATUS' => 'ICQ status',
+ 'ICQ_STATUS' => 'ICQ status',
'IF' => 'If',
'IMAGE' => 'Image',
'IMAGE_FILETYPE_INVALID' => 'Image file type %d for mimetype %s not supported.',
@@ -331,7 +331,7 @@ $lang = array_merge($lang, array(
'MODERATORS' => 'Moderators',
'MONTH' => 'Month',
'MOVE' => 'Move',
- 'MSNM' => 'MSNM/WLM',
+ 'MSNM' => 'MSNM/WLM',
'NA' => 'N/A',
'NEWEST_USER' => 'Our newest member
%s ',
@@ -370,7 +370,7 @@ $lang = array_merge($lang, array(
'NO_MEMBERS' => 'No members found for this search criterion.',
'NO_MESSAGES' => 'No messages',
'NO_MODE' => 'No mode specified.',
- 'NO_MODERATORS' => 'No moderators assigned at this board.',
+ 'NO_MODERATORS' => 'There are no moderators.',
'NO_NEW_MESSAGES' => 'No new messages',
'NO_NEW_PM' => '
0 new messages',
'NO_NEW_POSTS' => 'No new posts',
@@ -502,7 +502,7 @@ $lang = array_merge($lang, array(
'SEARCHING_FORUMS' => 'Searching forums',
'SEARCH_ACTIVE_TOPICS' => 'View active topics',
'SEARCH_FOR' => 'Search for',
- 'SEARCH_FORUM' => 'Search this forum…',
+ 'SEARCH_FORUM' => 'Search this forum…',
'SEARCH_NEW' => 'View new posts',
'SEARCH_POSTS_BY' => 'Search posts by',
'SEARCH_SELF' => 'View your posts',
@@ -545,7 +545,7 @@ $lang = array_merge($lang, array(
'THE_TEAM' => 'The team',
'TIME' => 'Time',
- 'TOO_LONG' => 'The value you entered is too long.',
+ 'TOO_LONG' => 'The value you entered is too long',
'TOO_LONG_AIM' => 'The screenname you entered is too long.',
'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.',
@@ -680,7 +680,7 @@ $lang = array_merge($lang, array(
'YEAR' => 'Year',
'YEAR_MONTH_DAY' => '(YYYY-MM-DD)',
'YES' => 'Yes',
- 'YIM' => 'YIM',
+ 'YIM' => 'YIM',
'YOU_LAST_VISIT' => 'Last visit was: %s',
'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox.',
'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox.',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index b8de2ee2d6..489c38d4d3 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1271,11 +1271,21 @@ switch ($mode)
$s_group_select = '
';
$group_ids = array();
+ /**
+ * @todo add this to a separate function (function is responsible for returning the groups the user is able to see based on the users group membership)
+ */
+
if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
{
$sql = 'SELECT group_id, group_name, group_type
- FROM ' . GROUPS_TABLE . '
- ORDER BY group_name ASC';
+ FROM ' . GROUPS_TABLE;
+
+ if (!$config['coppa_enable'])
+ {
+ $sql .= " WHERE group_name <> 'REGISTERED_COPPA'";
+ }
+
+ $sql .= ' ORDER BY group_name ASC';
}
else
{
@@ -1287,8 +1297,14 @@ switch ($mode)
AND ug.user_id = ' . $user->data['user_id'] . '
AND ug.user_pending = 0
)
- WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')
- ORDER BY g.group_name ASC';
+ WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')';
+
+ if (!$config['coppa_enable'])
+ {
+ $sql .= " WHERE group_name <> 'REGISTERED_COPPA'";
+ }
+
+ $sql .= ' ORDER BY g.group_name ASC';
}
$result = $db->sql_query($sql);
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 9aec127873..226cb31dfc 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -289,7 +289,7 @@ if ($mode == 'delete')
if ($mode == 'bump')
{
if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id'])
- && check_link_hash(request_var('hash', ''),"topic_{$post_data['topic_id']}"))
+ && check_link_hash(request_var('hash', ''), "topic_{$post_data['topic_id']}"))
{
$db->sql_transaction('begin');
diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg
index 83b5cdb710..3e1ea21dce 100644
--- a/phpBB/styles/prosilver/imageset/imageset.cfg
+++ b/phpBB/styles/prosilver/imageset/imageset.cfg
@@ -19,7 +19,7 @@
# General Information about this style
name = prosilver
copyright = © phpBB Group, 2007
-version = 3.0.0
+version = 3.0.3
# Images
img_site_logo = site_logo.gif*52*139
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index f1ea67f7ce..75c7c654ba 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -19,4 +19,5 @@
# General Information about this style
name = prosilver
copyright = © phpBB Group, 2007
-version = 3.0.0
\ No newline at end of file
+version = 3.0.0
+
diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html
index aec578985e..78c2fc11b7 100644
--- a/phpBB/styles/prosilver/template/faq_body.html
+++ b/phpBB/styles/prosilver/template/faq_body.html
@@ -16,7 +16,7 @@
{faq_block.BLOCK_TITLE} {faq_block.faq_row.FAQ_QUESTION} {faq_block.faq_row.FAQ_QUESTION}
@@ -36,7 +36,7 @@
{faq_block.BLOCK_TITLE}
- {faq_block.faq_row.FAQ_QUESTION} {faq_block.faq_row.FAQ_QUESTION} {faq_block.faq_row.FAQ_ANSWER}
{L_BACK_TO_TOP}
diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg
index 1251dcdce2..ebfc3f0d6b 100644
--- a/phpBB/styles/prosilver/template/template.cfg
+++ b/phpBB/styles/prosilver/template/template.cfg
@@ -19,7 +19,7 @@
# General Information about this template
name = prosilver
copyright = © phpBB Group, 2007
-version = 3.0.0
+version = 3.0.3
# Defining a different template bitfield
template_bitfield = lNg=
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 936b53f78a..00342604bb 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -385,6 +385,15 @@ dd .signature {
border: none;
}
+.signature li {
+ list-style-type: inherit;
+}
+
+.signature ul, .signature ol {
+ margin-bottom: 1em;
+ margin-left: 3em;
+}
+
/* Post noticies */
.notice {
font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg
index 19fb8517b2..efed06babb 100644
--- a/phpBB/styles/prosilver/theme/theme.cfg
+++ b/phpBB/styles/prosilver/theme/theme.cfg
@@ -21,7 +21,7 @@
# General Information about this theme
name = prosilver
copyright = © phpBB Group, 2007
-version = 3.0.0
+version = 3.0.3
# Some configuration options
diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index 44f44007d7..16aced113d 100644
--- a/phpBB/styles/subsilver2/imageset/imageset.cfg
+++ b/phpBB/styles/subsilver2/imageset/imageset.cfg
@@ -19,7 +19,7 @@
# General Information about this style
name = subsilver2
copyright = © phpBB Group, 2003
-version = 3.0.0
+version = 3.0.3
# Images
img_site_logo = site_logo.gif*94*170
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 7465d36673..c9a93c15de 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -19,4 +19,4 @@
# General Information about this style
name = subsilver2
copyright = © 2005 phpBB Group
-version = 3.0.0
+version = 3.0.3
diff --git a/phpBB/styles/subsilver2/template/faq_body.html b/phpBB/styles/subsilver2/template/faq_body.html
index 9e324b4fd2..bbd9b82b19 100644
--- a/phpBB/styles/subsilver2/template/faq_body.html
+++ b/phpBB/styles/subsilver2/template/faq_body.html
@@ -13,7 +13,7 @@
{faq_block.BLOCK_TITLE}
-
{faq_block.faq_row.FAQ_QUESTION}
+
{faq_block.faq_row.FAQ_QUESTION}
@@ -38,7 +38,7 @@
- » {faq_block.faq_row.FAQ_QUESTION} » {faq_block.faq_row.FAQ_QUESTION} {faq_block.faq_row.FAQ_ANSWER}
{L_BACK_TO_TOP}
diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg
index c83a1d94ad..47099947fc 100644
--- a/phpBB/styles/subsilver2/template/template.cfg
+++ b/phpBB/styles/subsilver2/template/template.cfg
@@ -19,5 +19,5 @@
# General Information about this template
name = subsilver2
copyright = © phpBB Group, 2003
-version = 3.0.0
+version = 3.0.3
diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg
index 648c5732a8..7d5bdd0615 100644
--- a/phpBB/styles/subsilver2/theme/theme.cfg
+++ b/phpBB/styles/subsilver2/theme/theme.cfg
@@ -21,7 +21,7 @@
# General Information about this theme
name = subsilver2
copyright = © phpBB Group, 2003
-version = 3.0.0
+version = 3.0.3
# Some configuration options
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index de64de5734..1165db0e2c 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -476,7 +476,7 @@ if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_n
// Bookmarks
if ($config['allow_bookmarks'] && $user->data['is_registered'] && request_var('bookmark', 0))
{
- if (check_link_hash(request_var('hash', ''),"topic_$topic_id"))
+ if (check_link_hash(request_var('hash', ''), "topic_$topic_id"))
{
if (!$topic_data['bookmarked'])
{