Dev more cleanup.

LimeSurvey · Sep 24, 2015 · 9d215be · 9d215be
1 parent 40ea61f
commit 9d215be
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 620 deletions.
diff --git a/protected/entry.php b/protected/entry.php
@@ -46,6 +46,6 @@
 require_once(__DIR__ . '/helpers/globals.php');
 
 
-$config = require_config($context, __DIR__ . '/config/internal.php');
+$config = require_config(__DIR__ . '/config/internal.php', $context);
 unset($context);
 Yii::createApplication(WebApplication::class, $config)->run();
diff --git a/protected/helpers/SurveyRuntime.php b/protected/helpers/SurveyRuntime.php
@@ -219,12 +219,12 @@ function run(SurveySession $session, $move)
             // jump to current step using new language, processing POST values
             $moveResult = LimeExpressionManager::JumpTo($session->getStep(), true, true, true);  // do process the POST data
         }
-        if (isset($move) && isNumericInt($move) && $session->survey->questionindex == Survey::INDEX_INCREMENTAL) {
+        if (isset($move) && is_numeric($move) && $session->survey->questionindex == Survey::INDEX_INCREMENTAL) {
             $move = (int)$move;
             if ($move > 0 && ($move <= $session->getStep() || $move <= $session->getMaxStep())) {
                 $moveResult = LimeExpressionManager::JumpTo($move);
             }
-        } elseif (isset($move) && isNumericInt($move) && $session->survey->questionindex == Survey::INDEX_FULL) {
+        } elseif (isset($move) && is_numeric($move) && $session->survey->questionindex == Survey::INDEX_FULL) {
             $moveResult = LimeExpressionManager::JumpTo($move, true, true);
             $session->setStep($moveResult['seq'] + 1);
         }