Added support for favicon.ico/gif/png in base path (very basic support)

[mailer.git] / inc / extensions-functions.php

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index e85a690cfb09932f411838a1ba1c3bbe3a636628..10a4dfc36cb353aff7fe84d14dc617f85d718c00 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -248,7 +248,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = FALSE, $ignoreUpdate
        $processResult = FALSE;
        initIncludePool('extension');
 
-       // By default we have no failures
+       // By default there is no failure
        enableExtensionReportingFailure();
 
        // Does this extension exists?
@@ -395,7 +395,7 @@ function registerExtension ($ext_name, $taskId, $isDryRun = FALSE, $ignoreUpdate
                                 * Use the insert id as extension id and "cache" all data for
                                 * this extension for early usage.
                                 */
-                               copyExtensionDataToCacheArray($currentName, SQL_INSERTID());
+                               copyExtensionDataToCacheArray($currentName, SQL_INSERT_ID());
 
                                // Mark it as installed
                                $GLOBALS['ext_is_installed'][$currentName] = TRUE;
@@ -1084,7 +1084,7 @@ function createNewExtensionTask ($ext_name) {
                // Load text for task if found
                if (isFileReadable($FQFN)) {
                        // Load extension's description template (but do not compile the code)
-                       $message = loadTemplate('ext_' . $ext_name, TRUE, array(), FALSE);
+                       $message = '{OPEN_TEMPLATE}template,LoadTemplate=ext_' . $ext_name . '{CLOSE_TEMPLATE}';
                } else {
                        // Write this in debug.log as well
                        logDebugMessage(__FUNCTION__, __LINE__, $message);