Follow-up to bug #13868: Integrate TYPO3 donate notice in the backend
authorSteffen Kamper <info@sk-typo3.de>
Sun, 23 May 2010 10:14:14 +0000 (10:14 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Sun, 23 May 2010 10:14:14 +0000 (10:14 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7664 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/classes/class.donatewindow.php
typo3/js/donate.js

index 91dd97f..8d486ea 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-05-22  Steffen Kamper  <info@sk-typo3.de>
 
+       * Follow-up to bug #13868: Integrate TYPO3 donate notice in the backend
        * Fixed bug #14387: Updating the CGLs [was: Remove the feature "Enable extensions without review (basic security check)" from EM] (thanks to Lars Houmark)
 
 2010-05-22  Oliver Hader  <oliver@typo3.org>
index 6715c98..01bc12f 100644 (file)
@@ -96,7 +96,7 @@ class DonateWindow implements t3lib_Singleton {
                $isCancelled = (isset($uc[self::FLAG_DonateWindowDisabled]) && !empty($uc[self::FLAG_DonateWindowDisabled]));
                $isPostponed = (isset($uc[self::FLAG_DonateWindowPostponed]) && $uc[self::FLAG_DonateWindowPostponed] > $GLOBALS['EXEC_TIME'] - self::VALUE_DonateWindowPostponeDays * 86400);
 
-               return ($isAdmin && $isAllowed && !$isCancelled && !$isPostponed);
+               return ($isAdmin && $isAllowed && $isTriggered && !$isCancelled && !$isPostponed);
        }
 
        /**
index e6787d4..a4731ef 100644 (file)
@@ -38,8 +38,8 @@ Ext.ux.TYPO3.donate = Ext.extend(Ext.util.Observable, {
        constructor: function(config) {
                this.ajaxRequestDefault = {
                        url: TYPO3.configuration.PATH_typo3 + 'ajax.php',
-                       success: function() {},
-                       failure: function() {}
+                       success: Ext.emptyFn,
+                       failure: Ext.emptyFn
                };
 
                config = config || {};