From 33ef42291fab05ea84497f6d520e950186ba4610 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 17 Aug 2010 13:50:52 +0000
Subject: - Patch #885000 by cwgordon7: drupal_placeholder() takes an array as
 an argument.

---
 includes/bootstrap.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'includes')

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 687a8b6f6..c1a2f3151 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1453,7 +1453,7 @@ function t($string, array $args = array(), array $options = array()) {
         case '%':
         default:
           // Escaped and placeholder.
-          $args[$key] = drupal_placeholder(array('text' => $value));
+          $args[$key] = drupal_placeholder($value);
           break;
 
         case '!':
@@ -2958,15 +2958,14 @@ function drupal_is_cli() {
  * Formats text for emphasized display in a placeholder inside a sentence.
  * Used automatically by t().
  *
- * @param $variables
- *   An associative array containing:
- *   - text: The text to format (plain-text).
+ * @param $text
+ *   The text to format (plain-text).
  *
  * @return
  *   The formatted text (html).
  */
-function drupal_placeholder($variables) {
-  return '<em class="placeholder">' . check_plain($variables['text']) . '</em>';
+function drupal_placeholder($text) {
+  return '<em class="placeholder">' . check_plain($text) . '</em>';
 }
 
 /**
-- 
cgit v1.2.3