WP Merge to #4669

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@829 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 8 insertions, 7 deletions

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index badd080..963992d 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -421,6 +421,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
@@ -429,12 +430,12 @@ function funky_javascript_fix($text) {
  @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, $force = false) {
+function balanceTags($text, $force = false) {
 
 	if ( !$force && get_option('use_balanceTags') == 0 )
 		return $text;
@@ -536,7 +537,7 @@ function balanceTags($text, $is_comment = 0, $force = false) {
 }
 
 function force_balance_tags($text) {
-	return balanceTags($text, 0, true);
+	return balanceTags($text, true);
 }
 
 function format_to_edit($content, $richedit = false) {
@@ -764,7 +765,7 @@ function human_time_diff( $from, $to = '' ) {
 		if ($days <= 1) {
 			$days = 1;
 		}
-		$since = sprintf(__('%s day', '%s days', $days), $days);
+		$since = sprintf(__ngettext('%s day', '%s days', $days), $days);
 	}
 	return $since;
 }