- #27551: Rename check_output() to check_markup(). Needs contrib updates!

10 files changed, 18 insertions, 18 deletions

diff --git a/modules/block.module b/modules/block.module
index 7ceec94ce..33867faea 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -104,7 +104,7 @@ function block_block($op = 'list', $delta = 0, $edit = array()) {
     case 'view':
       $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta));
       $data['subject'] = check_plain($block->title);
-      $data['content'] = check_output($block->body, $block->format, FALSE);
+      $data['content'] = check_markup($block->body, $block->format, FALSE);
       return $data;
   }
 }
diff --git a/modules/block/block.module b/modules/block/block.module
index 7ceec94ce..33867faea 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -104,7 +104,7 @@ function block_block($op = 'list', $delta = 0, $edit = array()) {
     case 'view':
       $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta));
       $data['subject'] = check_plain($block->title);
-      $data['content'] = check_output($block->body, $block->format, FALSE);
+      $data['content'] = check_markup($block->body, $block->format, FALSE);
       return $data;
   }
 }
diff --git a/modules/comment.module b/modules/comment.module
index fa3a98443..568471b97 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -277,7 +277,7 @@ function comment_nodeapi(&$node, $op, $arg = 0) {
       $text = '';
       $comments = db_query('SELECT subject, comment, format FROM {comments} WHERE nid = %d AND status = %d', $node->nid, COMMENT_PUBLISHED);
       while ($comment = db_fetch_object($comments)) {
-        $text .= '<h2>'. check_plain($comment->subject) .'</h2>'. check_output($comment->comment, $comment->format, FALSE);
+        $text .= '<h2>'. check_plain($comment->subject) .'</h2>'. check_markup($comment->comment, $comment->format, FALSE);
       }
       return $text;
 
@@ -472,8 +472,8 @@ function comment_validate($edit) {
     // 1) Filter it into HTML
     // 2) Strip out all HTML tags
     // 3) Convert entities back to plain-text.
-  // Note: format is checked by check_output().
-    $edit['subject'] = truncate_utf8(decode_entities(strip_tags(check_output($edit['comment'], $edit['format']))), 29, TRUE);
+  // Note: format is checked by check_markup().
+    $edit['subject'] = truncate_utf8(decode_entities(strip_tags(check_markup($edit['comment'], $edit['format']))), 29, TRUE);
   }
 
   // Validate the comment's body.
@@ -1458,7 +1458,7 @@ function theme_comment_view($comment, $links = '', $visible = 1) {
 
   // Switch to folded/unfolded view of the comment
   if ($visible) {
-    $comment->comment = check_output($comment->comment, $comment->format, FALSE);
+    $comment->comment = check_markup($comment->comment, $comment->format, FALSE);
     $output .= theme('comment', $comment, $links);
   }
   else {
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index fa3a98443..568471b97 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -277,7 +277,7 @@ function comment_nodeapi(&$node, $op, $arg = 0) {
       $text = '';
       $comments = db_query('SELECT subject, comment, format FROM {comments} WHERE nid = %d AND status = %d', $node->nid, COMMENT_PUBLISHED);
       while ($comment = db_fetch_object($comments)) {
-        $text .= '<h2>'. check_plain($comment->subject) .'</h2>'. check_output($comment->comment, $comment->format, FALSE);
+        $text .= '<h2>'. check_plain($comment->subject) .'</h2>'. check_markup($comment->comment, $comment->format, FALSE);
       }
       return $text;
 
@@ -472,8 +472,8 @@ function comment_validate($edit) {
     // 1) Filter it into HTML
     // 2) Strip out all HTML tags
     // 3) Convert entities back to plain-text.
-  // Note: format is checked by check_output().
-    $edit['subject'] = truncate_utf8(decode_entities(strip_tags(check_output($edit['comment'], $edit['format']))), 29, TRUE);
+  // Note: format is checked by check_markup().
+    $edit['subject'] = truncate_utf8(decode_entities(strip_tags(check_markup($edit['comment'], $edit['format']))), 29, TRUE);
   }
 
   // Validate the comment's body.
@@ -1458,7 +1458,7 @@ function theme_comment_view($comment, $links = '', $visible = 1) {
 
   // Switch to folded/unfolded view of the comment
   if ($visible) {
-    $comment->comment = check_output($comment->comment, $comment->format, FALSE);
+    $comment->comment = check_markup($comment->comment, $comment->format, FALSE);
     $output .= theme('comment', $comment, $links);
   }
   else {
diff --git a/modules/filter.module b/modules/filter.module
index 410667dd1..ce6128592 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -671,7 +671,7 @@ function filter_list_format($format) {
  *    showing content that is not (yet) stored in the database (eg. upon preview),
  *    set to TRUE so the user's permissions are checked.
  */
-function check_output($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
+function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
   // When $check = true, do an access check on $format.
   if (isset($text) && (!$check || filter_access($format))) {
     if ($format == FILTER_FORMAT_DEFAULT) {
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 410667dd1..ce6128592 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -671,7 +671,7 @@ function filter_list_format($format) {
  *    showing content that is not (yet) stored in the database (eg. upon preview),
  *    set to TRUE so the user's permissions are checked.
  */
-function check_output($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
+function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
   // When $check = true, do an access check on $format.
   if (isset($text) && (!$check || filter_access($format))) {
     if ($format == FILTER_FORMAT_DEFAULT) {
diff --git a/modules/node.module b/modules/node.module
index 04902ca7d..bf660be31 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -510,10 +510,10 @@ function node_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE) {
 function node_prepare($node, $teaser = FALSE) {
   $node->readmore = (strlen($node->teaser) < strlen($node->body));
   if ($teaser == FALSE) {
-    $node->body = check_output($node->body, $node->format, FALSE);
+    $node->body = check_markup($node->body, $node->format, FALSE);
   }
   else {
-    $node->teaser = check_output($node->teaser, $node->format, FALSE);
+    $node->teaser = check_markup($node->teaser, $node->format, FALSE);
   }
   return $node;
 }
diff --git a/modules/node/node.module b/modules/node/node.module
index 04902ca7d..bf660be31 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -510,10 +510,10 @@ function node_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE) {
 function node_prepare($node, $teaser = FALSE) {
   $node->readmore = (strlen($node->teaser) < strlen($node->body));
   if ($teaser == FALSE) {
-    $node->body = check_output($node->body, $node->format, FALSE);
+    $node->body = check_markup($node->body, $node->format, FALSE);
   }
   else {
-    $node->teaser = check_output($node->teaser, $node->format, FALSE);
+    $node->teaser = check_markup($node->teaser, $node->format, FALSE);
   }
   return $node;
 }
diff --git a/modules/profile.module b/modules/profile.module
index 184a03ba2..a62c23385 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -246,7 +246,7 @@ function profile_view_field($user, $field) {
       case 'textfield':
         return check_plain($value);
       case 'textarea':
-        return check_output($value);
+        return check_markup($value);
       case 'selection':
         return $browse ? l($value, "profile/$field->name/$value") : check_plain($value);
       case 'checkbox':
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 184a03ba2..a62c23385 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -246,7 +246,7 @@ function profile_view_field($user, $field) {
       case 'textfield':
         return check_plain($value);
       case 'textarea':
-        return check_output($value);
+        return check_markup($value);
       case 'selection':
         return $browse ? l($value, "profile/$field->name/$value") : check_plain($value);
       case 'checkbox':