aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5d37cc724a..abe592a100 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -242,7 +242,7 @@ function init_userprefs($userdata)
}
else
{
- $theme = setuptheme($board_config['override_user_themes']);
+ $theme = setuptheme($board_config['default_theme']);
}
if( $userdata['user_id'] != ANONYMOUS )
@@ -793,7 +793,7 @@ function smilies_pass($message)
for($i = 0; $i < count($smilies); $i++)
{
$orig[] = "'(?<=.\\W|\\W.|^\\W)" . preg_quote($smilies[$i]['code']) . "(?=.\\W|\\W.|\\W$)'i";
- $repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '">';
+ $repl[] = '<img src="'. $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'] . '" alt="' . $smilies[$i]['smile_url'] . '" border="0">';
}
if($i > 0)