More fixes for ext-yoomedia (didn't handle non-error responses correctly)

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

diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php
index 847fcf18f818218096494400f032b2220209922c..12de2776d313d95576d943b2a203c572ca4cefe6 100644 (file)
--- a/inc/extensions-functions.php
+++ b/inc/extensions-functions.php
@@ -155,7 +155,7 @@ function loadExtension ($ext_name, $ext_mode, $ext_ver = '0.0.0', $dry_run = fal
        loadCurrentExtensionInclude();
 
        // Is this extension deprecated?
-       if ((isExtensionDeprecated()) && (getExtensionMode() != 'test')) {
+       if ((isExtensionDeprecated()) && (!in_array(getExtensionMode(), array('test', 'update')))) {
                // Deactivate the extension
                doDeactivateExtension($ext_name);
 
@@ -947,7 +947,7 @@ function doDeactivateExtension ($ext_name) {
        // Is the extension installed?
        if (!isExtensionInstalled($ext_name)) {
                // Non-installed extensions cannot be activated
-               debug_report_bug(__FUNCTION__, __LINE__, 'Tried to deactivate non-installed extension ' . $ext_name);
+               debug_report_bug(__FUNCTION__, __LINE__, 'Tried to deactivate non-installed extension ' . $ext_name . ',getExtensionMode()=' . getExtensionMode());
        } // END - if
 
        // Activate the extension