diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 4 | ||||
| -rw-r--r-- | includes/common.inc | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 61f473a43..3c550b759 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1254,7 +1254,7 @@ function drupal_unpack($obj, $field = 'data') { * drupal_set_title($title = t("@name's blog", array('@name' => format_username($account))), PASS_THROUGH); * @endcode * - %variable: Indicates that the string should be HTML-escaped and highlighted - * with theme_placeholder(), which shows up by default as <em>emphasized</em>. + * with drupal_placeholder(), which shows up as <em>emphasized</em>. * @code * $message = t('%name-from sent %name-to an e-mail.', array('%name-from' => format_username($user), '%name-to' => format_username($account))); * @endcode @@ -1390,7 +1390,7 @@ function drupal_unpack($obj, $field = 'data') { * - !variable: inserted as is * - @variable: escape plain text to HTML (using check_plain()) * - %variable: escape text and theme as a placeholder for user-submitted - * content (using check_plain() + theme_placeholder()) + * content (using check_plain() + drupal_placeholder()) * @param $options * An associative array of additional options, with the following keys: * - 'langcode' (defaults to the current language) The language code to diff --git a/includes/common.inc b/includes/common.inc index f7a6ce3a4..acc65af5f 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1677,7 +1677,7 @@ function format_xml_elements($array) { * - !variable: inserted as is * - @variable: escape plain text to HTML (check_plain) * - %variable: escape text and theme as a placeholder for user-submitted - * content (check_plain + theme_placeholder) + * content (check_plain + drupal_placeholder) * Note that you do not need to include @count in this array. * This replacement is done automatically for the plural case. * @param $options @@ -6247,9 +6247,6 @@ function drupal_array_nested_key_exists(array $array, array $parents) { function drupal_common_theme() { return array( // theme.inc - 'placeholder' => array( - 'variables' => array('text' => NULL) - ), 'html' => array( 'render element' => 'page', 'template' => 'html', |