- Patch 20910 by chx: centralize print theme page.

1 files changed, 7 insertions, 6 deletions

diff --git a/modules/contact.module b/modules/contact.module
index 7f9646bb4..c5703bd58 100644
--- a/modules/contact.module
+++ b/modules/contact.module
@@ -153,7 +153,8 @@ function contact_mail_user() {
       $output  = form($output);
     }
 
-    print theme('page', $output, $account->name);
+    drupal_set_title($account->name);
+    return $output;
   }
   else {
     drupal_not_found();
@@ -185,17 +186,17 @@ function contact_admin_edit($subject = NULL) {
   $form .= form_textarea(t('Auto-reply'), 'reply', $subject->reply, 50, 10, t("Optional auto-reply.  Leave empty if you don't want to send the user an auto-reply message."));
   $form .= form_submit(t('Submit'));
 
-  print theme('page', form($form));
+  return form($form);
 }
 
 function contact_admin_delete($subject) {
   if ($_POST['op'] != t('Delete')) {
-    print theme('page', theme('confirm',
+    return theme('confirm',
                   t('Are you sure you want to delete %subject?', array('%subject' => theme('placeholder', $subject))),
                   'admin/contact/delete/'. $subject,
                   t('This action cannot be undone.'),
                   t('Delete'),
-                  t('Cancel')));
+                  t('Cancel'));
   }
   else {
     db_query("DELETE FROM {contact} WHERE subject = '%s'", $subject);
@@ -211,7 +212,7 @@ function contact_admin() {
     $rows[] = array($subject->subject, $subject->recipients, l(t('edit'), 'admin/contact/edit/'. $subject->subject), l(t('delete'), 'admin/contact/delete/'. $subject->subject));
   }
   $header = array(t('Subject'), t('Recipients'), array('data' => t('Operations'), 'colspan' => 2));
-  print theme('page', theme('table', $header, $rows));
+  return theme('table', $header, $rows);
 }
 
 function contact_mail_page() {
@@ -302,7 +303,7 @@ function contact_mail_page() {
     }
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 ?>