Sync balanceTags() and force_balance_tags() to trunk. fixes #2714

git-svn-id: http://svn.automattic.com/wordpress/branches/2.0@4663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2006-12-23 06:33:24 +00:00
parent 70902a4e04
commit bf83dbd55f
1 changed files with 15 additions and 14 deletions

View File

@ -403,6 +403,7 @@ function funky_javascript_fix($text) {
Balances Tags of string using a modified stack.
@param text Text to be balanced
@param force Forces balancing, ignoring the value of the option
@return Returns balanced text
@author Leonard Lin (leonard@acm.org)
@version v1.1
@ -416,9 +417,9 @@ function funky_javascript_fix($text) {
Added Cleaning Hooks
1.0 First Version
*/
function balanceTags($text, $is_comment = 0) {
function balanceTags($text, $force = false) {
if ( get_option('use_balanceTags') == 0)
if ( !$force && get_option('use_balanceTags') == 0 )
return $text;
$tagstack = array(); $stacksize = 0; $tagqueue = ''; $newtext = '';
@ -518,7 +519,7 @@ function balanceTags($text, $is_comment = 0) {
}
function force_balance_tags($text) {
return balanceTags($text, 0, true);
return balanceTags($text, true);
}
function format_to_edit($content, $richedit = false) {