Renamed functions to make it more clear, ext-coupon continued:

[mailer.git] / inc / modules / admin / what-theme_import.php

diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php
index 84206c4a517a131bc89aa579f0ea9e286feef85f..0d6ad900376e53aaeb6e0c3707f6f9fc63b9f6d8 100644 (file)
--- a/inc/modules/admin/what-theme_import.php
+++ b/inc/modules/admin/what-theme_import.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('theme')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 } // END - if
 
@@ -78,7 +78,7 @@ VALUES ('%s','N','%s','%s')",
                        // Prepare message
                        $message = getMaskedMessage('ADMIN_THEME_IMPORTED', postRequestParameter('theme'));
                } else {
-                       // Include file not found!
+                       // Include file not found
                        $message = getMaskedMessage('ADMIN_THEME_INC_404', postRequestParameter('theme'));
                }
        } else {
@@ -87,7 +87,7 @@ VALUES ('%s','N','%s','%s')",
        }
 
        // Output message
-       loadTemplate('admin_settings_saved', false, $message);
+       displayMessage($message);
 } // END - if
 
 // Initialize array
@@ -152,7 +152,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 
 if (empty($OUT)) {
        // No themes found???
-       $OUT .= loadTemplate('admin_import_theme_none', true, loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}'));
+       $OUT .= loadTemplate('admin_import_theme_none', true, displayMessage('{--ADMIN_NO_THEMES_FOUND--}', true));
 } // END - if
 
 // Load template