Changeset 4663

Timestamp:

12/23/2006 06:33:24 AM (18 years ago)

Author:

markjaquith

Message:

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

File:

• branches/2.0/wp-includes/functions-formatting.php (modified) (5 diffs)

branches/2.0/wp-includes/functions-formatting.php

@@ -400 +400 @@
 /*
  balanceTags
- 
+
  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)
@@ -409 +410 @@
  @date            November 4, 2001
  @license         GPL v2.0
- @notes           
- @changelog       
+ @notes
+ @changelog
  ---  Modified by Scott Reilly (coffee2code) 02 Aug 2004
-             1.2  ***TODO*** Make better - change loop condition to $text
-             1.1  Fixed handling of append/stack pop order of end text
-                  Added Cleaning Hooks
-             1.0  First Version
+    1.2  ***TODO*** Make better - change loop condition to $text
+    1.1  Fixed handling of append/stack pop order of end text
+         Added Cleaning Hooks
+    1.0  First Version
 */
-function balanceTags($text, $is_comment = 0) {
-    
-    if ( get_option('use_balanceTags') == 0)
+function balanceTags($text, $force = false) {
+
+    if ( !$force && get_option('use_balanceTags') == 0 )
         return $text;
 
@@ -441 +442 @@
             $tag = strtolower(substr($regex[1],1));
             // if too many closing tags
-            if($stacksize <= 0) { 
+            if($stacksize <= 0) {
                 $tag = '';
                 //or close to be safe $tag = '/' . $tag;
@@ -498 +499 @@
         $newtext .= substr($text,0,$i) . $tag;
         $text = substr($text,$i+$l);
-    }  
+    }
 
     // Clear Tag Queue
@@ -519 +520 @@
 
 function force_balance_tags($text) {
-    return balanceTags($text, 0, true);
+    return balanceTags($text, true);
 }