- Added option to select skin in user preferences (#1485031)

- template_exists() moved to rcube_template class

4 files changed, 6 insertions, 6 deletions

diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 9cda22b5b..4b50fa26f 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -113,7 +113,7 @@ function get_form_tags($attrib)
 
 
 
-if (!$CONTACTS->get_result() && template_exists('addcontact'))
+if (!$CONTACTS->get_result() && $OUTPUT->template_exists('addcontact'))
   $OUTPUT->send('addcontact');
 
 // this will be executed if no template for addcontact exists
diff --git a/program/steps/error.inc b/program/steps/error.inc
index 5cde93cfc..bd6fa2873 100644
--- a/program/steps/error.inc
+++ b/program/steps/error.inc
@@ -97,7 +97,7 @@ EOF;
 
 
 
-if (template_exists('error'))
+if ($OUTPUT->template_exists('error'))
   {
   $OUTPUT->reset();
   $OUTPUT->send('error');
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 3cdf2c9a5..bff4e6861 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -32,7 +32,7 @@ if ($_GET['_uid']) {
   // go back to list if message not found (wrong UID)
   if (empty($MESSAGE->headers)) {
     $OUTPUT->show_message('messageopenerror', 'error');
-    if ($RCMAIL->action=='preview' && template_exists('messagepreview'))
+    if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
         $OUTPUT->send('messagepreview');
     else {
       $RCMAIL->action = 'list';
@@ -194,9 +194,9 @@ $OUTPUT->add_handlers(array(
   'blockedobjects' => 'rcmail_remote_objects_msg'));
 
 
-if ($RCMAIL->action=='print' && template_exists('printmessage'))
+if ($RCMAIL->action=='print' && $OUTPUT->template_exists('printmessage'))
   $OUTPUT->send('printmessage');
-else if ($RCMAIL->action=='preview' && template_exists('messagepreview'))
+else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
     $OUTPUT->send('messagepreview');
 else
   $OUTPUT->send('message');
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 43cbf3d17..cc541a6ef 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -136,7 +136,7 @@ function rcube_identity_form($attrib)
 
 $OUTPUT->add_handler('identityform', 'rcube_identity_form');
 
-if ($RCMAIL->action=='add-identity' && template_exists('addidentity'))
+if ($RCMAIL->action=='add-identity' && $OUTPUT->template_exists('addidentity'))
   $OUTPUT->send('addidentity');
 
 $OUTPUT->send('editidentity');