[Gemstracker-svn] SF.net SVN: gemstracker:[1200] trunk/library/classes/MUtil

[<gem...@li...>]

Revision: 1200
          http://sourceforge.net/p/gemstracker/code/1200
Author:   matijsdejong
Date:     2013-03-21 15:09:37 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Extra comments and changed echo output to always

Modified Paths:
--------------
    trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
    trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php
    trunk/library/classes/MUtil/Model/JoinModel.php
    trunk/library/classes/MUtil/Model/SelectModel.php

Modified: trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php	2013-03-21 10:59:41 UTC (rev 1199)
+++ trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php	2013-03-21 15:09:37 UTC (rev 1200)
@@ -323,7 +323,7 @@
             $this->addSnippets($this->autofilterSnippets, $params);
         }
 
-        if ($resetMvc && MUtil_Echo::hasOutput()) {
+        if ($resetMvc) {
             // Lazy call here, because any echo calls in the snippets have not yet been
             // performed. so they will appear only in the next call when not lazy.
             $this->html->raw(MUtil_Lazy::call(array('MUtil_Echo', 'out')));

Modified: trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php	2013-03-21 10:59:41 UTC (rev 1199)
+++ trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php	2013-03-21 15:09:37 UTC (rev 1200)
@@ -843,7 +843,7 @@
     /**
      * The select object where we get the query from.
      *
-     * @return Zend_Db_Table_Select
+     * @return Zend_Db_Select
      */
     abstract public function getSelect();
 

Modified: trunk/library/classes/MUtil/Model/JoinModel.php
===================================================================
--- trunk/library/classes/MUtil/Model/JoinModel.php	2013-03-21 10:59:41 UTC (rev 1199)
+++ trunk/library/classes/MUtil/Model/JoinModel.php	2013-03-21 15:09:37 UTC (rev 1200)
@@ -292,6 +292,11 @@
         return $this->_select->getAdapter();
     }
 
+    /**
+     * The select object where we get the query from.
+     *
+     * @return Zend_Db_Select
+     */
     public function getSelect()
     {
         $select = clone $this->_select;

Modified: trunk/library/classes/MUtil/Model/SelectModel.php
===================================================================
--- trunk/library/classes/MUtil/Model/SelectModel.php	2013-03-21 10:59:41 UTC (rev 1199)
+++ trunk/library/classes/MUtil/Model/SelectModel.php	2013-03-21 15:09:37 UTC (rev 1200)
@@ -109,7 +109,7 @@
     /**
      * The select object where we get the query from.
      *
-     * @return Zend_Db_Table_Select
+     * @return Zend_Db_Select
      */
     public function getSelect()
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.