Rename chkSysMsg => hasMessage

t3framework · Feb 1, 2013 · 334cf77 · 334cf77
1 parent f5f6fcb
commit 334cf77
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/source/plg_system_t3/includes/core/template.php b/source/plg_system_t3/includes/core/template.php
@@ -326,27 +326,10 @@ function checkSpotlight($name, $positions)
 	/**
 	 * Check system messages
 	 */
-	function checkSysMsg()
+	function hasMessage()
 	{
-		// Initialise variables.
-		$lists = array();
-
 		// Get the message queue
-		$messages = JFactory::getApplication()->getMessageQueue();
-
-		// Build the sorted message list
-		if (is_array($messages) && !empty($messages))
-		{
-			foreach ($messages as $msg)
-			{
-				if (isset($msg['type']) && isset($msg['message']))
-				{
-					$lists[$msg['type']][] = $msg['message'];
-				}
-			}
-		}
-
-		return count($lists);
+		return !empty(JFactory::getApplication()->getMessageQueue());
 	}
 
 	/**

diff --git a/source/tpl_t3_blank/tpls/blocks/mainbody-content-left.php b/source/tpl_t3_blank/tpls/blocks/mainbody-content-left.php
@@ -57,7 +57,7 @@
 
     <!-- MAIN CONTENT -->
     <div id="t3-content" class="t3-content <?php echo $this->getClass($layout, $col) ?>" <?php echo $this->getData ($layout, $col++) ?>>
-      <?php if($this->checkSysMsg()):?>
+      <?php if($this->hasMessage()):?>
       <jdoc:include type="message" />
       <?php endif; ?>
       <jdoc:include type="component" />

diff --git a/source/tpl_t3_blank/tpls/blocks/mainbody-content-right.php b/source/tpl_t3_blank/tpls/blocks/mainbody-content-right.php
@@ -57,7 +57,7 @@
 
     <!-- MAIN CONTENT -->
     <div id="t3-content" class="t3-content <?php echo $this->getClass($layout, $col) ?>" <?php echo $this->getData ($layout, $col++) ?>>
-      <?php if($this->checkSysMsg()):?>
+      <?php if($this->hasMessage()):?>
       <jdoc:include type="message" />
       <?php endif; ?>
       <jdoc:include type="component" />

diff --git a/source/tpl_t3_blank/tpls/blocks/mainbody.php b/source/tpl_t3_blank/tpls/blocks/mainbody.php
@@ -61,7 +61,7 @@
 
     <!-- MAIN CONTENT -->
     <div id="t3-content" class="t3-content <?php echo $this->getClass($layout, $col) ?>" <?php echo $this->getData ($layout, $col++) ?>>
-      <?php if($this->checkSysMsg()):?>
+      <?php if($this->hasMessage()):?>
       <jdoc:include type="message" />
       <?php endif; ?>
       <jdoc:include type="component" />