diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-12-22 14:47:14 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-12-22 14:47:14 +0000 |
commit | 8749a43a5419fd0e55034a23afb3fc63158ccd5f (patch) | |
tree | 1e13e3a8b5ec70fb99a29bc6cda5bc304125cf25 /modules | |
parent | a71fd090aeefd818d80c6163c690694ea6259859 (diff) | |
download | brdo-8749a43a5419fd0e55034a23afb3fc63158ccd5f.tar.gz brdo-8749a43a5419fd0e55034a23afb3fc63158ccd5f.tar.bz2 |
- Patch #601548 by Damien Tournoud, moshe weitzman: loosen the dependency between t() and the theming layer.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/filter/filter.admin.inc | 4 | ||||
-rw-r--r-- | modules/filter/filter.module | 6 | ||||
-rw-r--r-- | modules/node/node.module | 2 | ||||
-rw-r--r-- | modules/node/node.pages.inc | 2 | ||||
-rw-r--r-- | modules/php/php.module | 2 | ||||
-rw-r--r-- | modules/profile/profile.pages.inc | 2 | ||||
-rw-r--r-- | modules/simpletest/simpletest.module | 2 | ||||
-rw-r--r-- | modules/update/update.report.inc | 4 | ||||
-rw-r--r-- | modules/user/user.module | 6 |
9 files changed, 15 insertions, 15 deletions
diff --git a/modules/filter/filter.admin.inc b/modules/filter/filter.admin.inc index d7b9e5276..66757e9e4 100644 --- a/modules/filter/filter.admin.inc +++ b/modules/filter/filter.admin.inc @@ -23,8 +23,8 @@ function filter_admin_overview($form) { // to all roles and cannot be deleted via the admin interface. $form['formats'][$id]['#is_fallback'] = ($id == $fallback_format); if ($form['formats'][$id]['#is_fallback']) { - $form['formats'][$id]['name'] = array('#markup' => theme('placeholder', array('text' => $format->name))); - $roles_markup = theme('placeholder', array('text' => t('All roles may use this format'))); + $form['formats'][$id]['name'] = array('#markup' => drupal_placeholder(array('text' => $format->name))); + $roles_markup = drupal_placeholder(array('text' => t('All roles may use this format'))); } else { $form['formats'][$id]['name'] = array('#markup' => check_plain($format->name)); diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 235cb187a..8d66220b5 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -268,7 +268,7 @@ function filter_admin_format_title($format) { function filter_permission() { $perms['administer filters'] = array( 'title' => t('Administer and use any text formats and filters'), - 'description' => theme('placeholder', array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))), ); // Generate permissions for each text format. Warn the administrator that any @@ -278,10 +278,10 @@ function filter_permission() { if (!empty($permission)) { // Only link to the text format configuration page if the user who is // viewing this will have access to that page. - $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : theme('placeholder', array('text' => $format->name)); + $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : drupal_placeholder(array('text' => $format->name)); $perms[$permission] = array( 'title' => t("Use the !text_format text format", array('!text_format' => $format_name_replacement,)), - 'description' => theme('placeholder', array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: This permission may have security implications depending on how the text format is configured.'))), ); } } diff --git a/modules/node/node.module b/modules/node/node.module index b0ed0c736..8eea554a6 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1423,7 +1423,7 @@ function node_permission() { ), 'administer nodes' => array( 'title' => t('Administer content'), - 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), 'access content' => array( 'title' => t('View published content'), diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index 63d818a5f..414db3570 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -521,7 +521,7 @@ function node_revision_overview($node) { $row[] = array('data' => t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid"), '!username' => theme('username', array('account' => $revision)))) . (($revision->log != '') ? '<p class="revision-log">' . filter_xss($revision->log) . '</p>' : ''), 'class' => array('revision-current')); - $operations[] = array('data' => theme('placeholder', array('text' => t('current revision'))), 'class' => array('revision-current'), 'colspan' => 2); + $operations[] = array('data' => drupal_placeholder(array('text' => t('current revision'))), 'class' => array('revision-current'), 'colspan' => 2); } else { $row[] = t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => theme('username', array('account' => $revision)))) diff --git a/modules/php/php.module b/modules/php/php.module index 74538a424..05a828a3c 100644 --- a/modules/php/php.module +++ b/modules/php/php.module @@ -31,7 +31,7 @@ function php_permission() { return array( 'use PHP for settings' => array( 'title' => t('Use PHP for settings'), - 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), ); } diff --git a/modules/profile/profile.pages.inc b/modules/profile/profile.pages.inc index 8c60c68f7..9bb406bb4 100644 --- a/modules/profile/profile.pages.inc +++ b/modules/profile/profile.pages.inc @@ -77,7 +77,7 @@ function profile_browse() { $output .= theme('pager', array('tags' => NULL)); if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'textfield') { - $title = strtr(check_plain($field->page), array('%value' => theme('placeholder', array('text' => $value)))); + $title = strtr(check_plain($field->page), array('%value' => drupal_placeholder(array('text' => $value)))); } else { $title = check_plain($field->page); diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module index 35f84c2a5..6b7db15cc 100644 --- a/modules/simpletest/simpletest.module +++ b/modules/simpletest/simpletest.module @@ -68,7 +68,7 @@ function simpletest_permission() { return array( 'administer unit tests' => array( 'title' => t('Administer tests'), - 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), ); } diff --git a/modules/update/update.report.inc b/modules/update/update.report.inc index 1f0081ec6..1b673ae80 100644 --- a/modules/update/update.report.inc +++ b/modules/update/update.report.inc @@ -164,7 +164,7 @@ function theme_update_report($variables) { foreach ($project['extra'] as $key => $value) { $row .= '<div class="' . implode(' ', $value['class']) . '">'; $row .= check_plain($value['label']) . ': '; - $row .= theme('placeholder', array('text' => $value['data'])); + $row .= drupal_placeholder(array('text' => $value['data'])); $row .= "</div>\n"; } $row .= "</div>\n"; // extra div. @@ -199,7 +199,7 @@ function theme_update_report($variables) { break; default: - $base_themes[] = theme('placeholder', array('text' => $base_theme)); + $base_themes[] = drupal_placeholder(array('text' => $base_theme)); } } $row .= t('Depends on: !basethemes', array('!basethemes' => implode(', ', $base_themes))); diff --git a/modules/user/user.module b/modules/user/user.module index 716780030..432f936b9 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -767,11 +767,11 @@ function user_permission() { return array( 'administer permissions' => array( 'title' => t('Administer permissions'), - 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), 'administer users' => array( 'title' => t('Administer users'), - 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), 'access user profiles' => array( 'title' => t('View user profiles'), @@ -785,7 +785,7 @@ function user_permission() { ), 'select account cancellation method' => array( 'title' => t('Select method for cancelling own account'), - 'description' => theme('placeholder', array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), + 'description' => drupal_placeholder(array('text' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), ); } |