mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

#14850

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8207 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-10-20 10:13:57 +00:00
parent 5d8ac9a393
commit f31626cec7
7 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/acp_users_signature.html
View File

@@ -27,7 +27,7 @@
t: '{LA_BBCODE_T_HELP}', t: '{LA_BBCODE_T_HELP}',
tip: '{L_STYLES_TIP}' tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags --> <!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags --> <!-- END custom_tags -->
} }

2
phpBB/adm/style/install_update.html
View File

@@ -201,7 +201,7 @@
<h2>{files.TITLE}</h2> <h2>{files.TITLE}</h2>
<!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0);">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF --> <!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF -->
<p>{files.EXPLAIN}</p> <p>{files.EXPLAIN}</p>
<div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}"> <div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">

1
phpBB/docs/CHANGELOG.html
View File

@@ -92,6 +92,7 @@
<li>[Fix] Fixing false new private message indicator (Bug #14627)</li> <li>[Fix] Fixing false new private message indicator (Bug #14627)</li>
<li>[Fix] Let newly activated passwords work if users were converted (Bug #14787)</li> <li>[Fix] Let newly activated passwords work if users were converted (Bug #14787)</li>
<li>[Fix] Quote bbcode fixes. Letting parse quote=&quot;[&quot; and re-allowing whitelisted bbcodes within username portion (Bug #14770)</li> <li>[Fix] Quote bbcode fixes. Letting parse quote=&quot;[&quot; and re-allowing whitelisted bbcodes within username portion (Bug #14770)</li>
<li>[Sec] Fix bbcode helpline display for custom bbcodes - this requires style changes for any custom style (Bug #14850)</li>
</ul> </ul>
<a name="v30rc6"></a><h3>1.ii. Changes since 3.0.RC6</h3> <a name="v30rc6"></a><h3>1.ii. Changes since 3.0.RC6</h3>

5
phpBB/includes/acp/acp_styles.php
View File

@@ -993,6 +993,11 @@ parse_css_file = {PARSE_CSS_FILE}
$filename = "{$cache_prefix}_$file.html.$phpEx"; $filename = "{$cache_prefix}_$file.html.$phpEx";
if (!file_exists("{$phpbb_root_path}cache/$filename"))
{
continue;
}
$template->assign_block_vars('file', array( $template->assign_block_vars('file', array(
'U_VIEWSOURCE' => $this->u_action . "&amp;action=cache&amp;id=$template_id&amp;source=$file", 'U_VIEWSOURCE' => $this->u_action . "&amp;action=cache&amp;id=$template_id&amp;source=$file",

5
phpBB/includes/functions_display.php
View File

@@ -826,8 +826,9 @@ function display_custom_bbcodes()
'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'", 'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'",
'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2), 'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2),
'BBCODE_TAG' => $row['bbcode_tag'], 'BBCODE_TAG' => $row['bbcode_tag'],
'BBCODE_HELPLINE' => str_replace(array('&amp;', '&quot;', "'", '&lt;', '&gt;'), array('\&', '\"', '\\\'', '<', '>'), $row['bbcode_helpline'])) 'BBCODE_HELPLINE' => $row['bbcode_helpline'],
); 'A_BBCODE_HELPLINE' => str_replace(array('&amp;', '&quot;', "'", '&lt;', '&gt;'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']),
));
$i++; $i++;
} }

2
phpBB/styles/prosilver/template/posting_buttons.html
View File

@@ -28,7 +28,7 @@
e: '{LA_BBCODE_E_HELP}', e: '{LA_BBCODE_E_HELP}',
d: '{LA_BBCODE_D_HELP}' d: '{LA_BBCODE_D_HELP}'
<!-- BEGIN custom_tags --> <!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags --> <!-- END custom_tags -->
} }

2
phpBB/styles/subsilver2/template/posting_buttons.html
View File

@@ -26,7 +26,7 @@
t: '{LA_BBCODE_T_HELP}', t: '{LA_BBCODE_T_HELP}',
tip: '{L_STYLES_TIP}' tip: '{L_STYLES_TIP}'
<!-- BEGIN custom_tags --> <!-- BEGIN custom_tags -->
,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}'
<!-- END custom_tags --> <!-- END custom_tags -->
} }