Merge branch 'master' of github.com:colosa/processmaker

2013-11-04 10:13:03 -04:00
parent 305d393411 6521c0dadb
commit 02865b8045
8 changed files with 62 additions and 50 deletions
--- a/workflow/engine/classes/model/AdditionalTables.php
+++ b/workflow/engine/classes/model/AdditionalTables.php
@@ -412,6 +412,9 @@ class AdditionalTables extends BaseAdditionalTables
            }
            $stringOr .= ');';
            eval($stringOr);
+
+            $oCriteriaCount = clone $oCriteria;
+            eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
        }

        if (isset($_POST['sort'])) {