Fixed issue #4797: Fix page advancement in group-by-group mode with c…

…onditionals.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9734 b72ed6b6-b9f8-46b5-92b4-906544132732

group.php

@@ -24,7 +24,8 @@
 $show_empty_group = false;
 if (!isset($homedir) || isset($_REQUEST['$homedir'])) {die("Cannot run this script directly");}
 
-if ($previewgrp){
+if ($previewgrp)
+{
 	$_SESSION['prevstep'] = 1;
 	$_SESSION['maxstep'] = 0;
 }
@@ -93,7 +94,7 @@
     {
         while(isset($_SESSION['grouplist'][$_SESSION['step']-1]) && checkgroupfordisplay($_SESSION['grouplist'][$_SESSION['step']-1][0]) === false)
         {
-            if ($_SESSION['prevstep'] <= $_SESSION['step'])
+            if ($_SESSION['prevstep'] > $_SESSION['step'])
             {
                 $_SESSION['step']=$_SESSION['step']-1;
             }
@@ -1319,7 +1320,7 @@ function checkconditions(value, name, type)
                 if($ia[5] != $g[0])
                     continue;
 
-                $qidattributes=getQuestionAttributes($ia[0]);
+                $qidattributes=getQuestionAttributes($ia[0], $ia[4]);
                 if($qidattributes['hidden']==1 || !checkquestionfordisplay($ia[0]))
                     continue;