From 28feea3cc56e75a9d4d169c34d2609e8847cf30b Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Wed, 23 Aug 2006 04:40:57 +0000
Subject: #80079 by drewish, fix some double placeholdering and other bugs with
 using t().

---
 modules/node/content_types.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/node')

diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index 0e6d05bc9..6e0fb0d7f 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -280,7 +280,7 @@ function node_type_form_submit($form_id, $form_values) {
       $update_count = node_type_update_nodes($type->old_type, $type->type);
 
       if ($update_count) {
-        drupal_set_message(t('Changed the content type of %update_count %posts from %old_type to %type.', array('%update_count' => $update_count, '%posts' => format_plural($update_count, 'post', 'posts'), '%old_type' => theme('placeholder', $type->old_type), '%type' => theme('placeholder', $type->type))));
+        drupal_set_message(t('Changed the content type of %update_count %posts from %old_type to %type.', array('%update_count' => $update_count, '%posts' => format_plural($update_count, 'post', 'posts'), '%old_type' => $type->old_type, '%type' => $type->type)));
         cache_clear_all('filter:', TRUE);
       }
     }
@@ -320,7 +320,7 @@ function node_type_form_submit($form_id, $form_values) {
   node_types_rebuild();
   menu_rebuild();
   cache_clear_all();
-  $t_args = array('%name' => theme('placeholder', $type->name));
+  $t_args = array('%name' => $type->name);
 
   if ($op == t('Reset to defaults')) {
     drupal_set_message(t('The content type %name has been reset to its default values.', $t_args));
@@ -366,7 +366,7 @@ function node_type_delete($type) {
   $form['type'] = array('#type' => 'value', '#value' => $type->type);
   $form['name'] = array('#type' => 'value', '#value' => $type->name);
 
-  $message = t('Are you sure you want to delete the content type %type?', array('%type' => theme('placeholder', $type->name)));
+  $message = t('Are you sure you want to delete the content type %type?', array('%type' => $type->name));
   $caption = '';
 
   $num_nodes = db_num_rows(db_query("SELECT * FROM {node} WHERE type = '%s'", $type->type));
@@ -385,7 +385,7 @@ function node_type_delete($type) {
 function node_type_delete_form_submit($form_id, $form_values) {
   db_query("DELETE FROM {node_type} WHERE type = '%s'", $form_values['type']);
 
-  $t_args = array('%name' => theme('placeholder', $form_values['name']));
+  $t_args = array('%name' => $form_values['name']);
   drupal_set_message(t('The content type %name has been deleted.', $t_args));
   watchdog('menu', t('Deleted content type %name.', $t_args), WATCHDOG_NOTICE);
 
-- 
cgit v1.2.3