[Joomla-commits] r22947 - in development/trunk: installation plugins/system/cache

[githu...@jcode001.directrouter.com]

Author: github_bot
Date: 2012-03-25 14:16:17 -0500 (Sun, 25 Mar 2012)
New Revision: 22947

Modified:
development/trunk/installation/CHANGELOG
development/trunk/plugins/system/cache/cache.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2012-03-23 17:56:13 UTC (rev 22946)
+++ development/trunk/installation/CHANGELOG 2012-03-25 19:16:17 UTC (rev 22947)
@@ -26,6 +26,9 @@
- -> Removed
! -> Note

+25-Mar-2012 Christophe Demko
+ # [#28284] System messages included in cached pages
+
23-Mar-2012 Jean-Marie Simonet
$ Updating installation ini file sq-IQ

Modified: development/trunk/plugins/system/cache/cache.php
===================================================================
--- development/trunk/plugins/system/cache/cache.php 2012-03-23 17:56:13 UTC (rev 22946)
+++ development/trunk/plugins/system/cache/cache.php 2012-03-25 19:16:17 UTC (rev 22947)
@@ -55,6 +55,10 @@
return;
}

+ if (count($app->getMessageQueue())) {
+ return;
+ }
+
if ($user->get('guest') && $_SERVER['REQUEST_METHOD'] == 'GET') {
$this->_cache->setCaching(true);
}
@@ -85,6 +89,10 @@
return;
}

+ if (count($app->getMessageQueue())) {
+ return;
+ }
+
$user = JFactory::getUser();
if ($user->get('guest')) {
//We need to check again here, because auto-login plugins have not been fired before the first aid check

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits