aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorHari Sankar R <hsr@theinglorio.us>2012-04-09 00:33:55 +0530
committerHari Sankar R <hsr@theinglorio.us>2012-04-09 00:33:55 +0530
commit4e630ef1601ef39c7947de7d071fdccf68f52e3b (patch)
treea606c463655427cf8fd30e84d888c85f3b88d437 /phpBB
parent03a35581c4b0dcb7c20885d4ca807ea7117872cb (diff)
downloadforums-4e630ef1601ef39c7947de7d071fdccf68f52e3b.tar
forums-4e630ef1601ef39c7947de7d071fdccf68f52e3b.tar.gz
forums-4e630ef1601ef39c7947de7d071fdccf68f52e3b.tar.bz2
forums-4e630ef1601ef39c7947de7d071fdccf68f52e3b.tar.xz
forums-4e630ef1601ef39c7947de7d071fdccf68f52e3b.zip
[ticket/10561] Casted $config['default_style'] to int
PHPBB3-10561
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/ucp/ucp_prefs.php2
-rw-r--r--phpBB/install/database_update.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index f6fe916d8b..17d7d23f02 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -63,7 +63,7 @@ class ucp_prefs
{
if ($config['override_user_style'])
{
- $data['style'] = $config['default_style'];
+ $data['style'] = (int) $config['default_style'];
}
else if (!phpbb_style_is_active($data['style']))
{
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 8f00b18846..576b3c0ba8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2045,7 +2045,7 @@ function change_database_data(&$no_updates, $version)
if (!empty($deactivated_style_ids))
{
$sql = 'UPDATE ' . USERS_TABLE . '
- SET user_style = ' . $config['default_style'] .'
+ SET user_style = ' . (int) $config['default_style'] .'
WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids);
$result = $db->sql_query($sql);
}