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

Merge remote-tracking branch 'sadu/ticket/10438' into develop

Browse source 
* sadu/ticket/10438:
  [ticket/10438] Alligning the Smileys on the same line as the text.
This commit is contained in:
Igor Wiedler 2012-04-01 21:39:37 +02:00
commit 2c68dc2e6d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_content.php
View file

@ -739,7 +739,7 @@ function smiley_text($text, $force_option = false)
else else
{ {
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path; $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $root_path . $config['smilies_path'] . '/\2 />', $text); return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
} }
} }

4
phpBB/styles/prosilver/theme/common.css
View file

@ -713,3 +713,7 @@ p.rules a {
.hidden { .hidden {
display: none; display: none;
} }
.smilies {
vertical-align: text-bottom;
}