summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-08-17 13:50:52 +0000
committerDries Buytaert <dries@buytaert.net>2010-08-17 13:50:52 +0000
commit33ef42291fab05ea84497f6d520e950186ba4610 (patch)
treefa575e70c5f257d98f36d260c684b7dd4b282a1c /includes
parent5d6bc299ff1da408d24d618f800cd6f10d42062d (diff)
downloadbrdo-33ef42291fab05ea84497f6d520e950186ba4610.tar.gz
brdo-33ef42291fab05ea84497f6d520e950186ba4610.tar.bz2
- Patch #885000 by cwgordon7: drupal_placeholder() takes an array as an argument.
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc11
1 files changed, 5 insertions, 6 deletions
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>';
}
/**