Fixed issue #17458: Check integrty broke fpor subquestion with only n…

…umber (#2313) Dev: Try cast and don't throw error
LimeSurvey · Jul 20, 2022 · 1dc8b53 · gabrieljenik · Sep 16, 2022 · Shnoulle
1 parent 8965fb5
commit 1dc8b53
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/application/controllers/admin/CheckIntegrity.php b/application/controllers/admin/CheckIntegrity.php
@@ -633,12 +633,14 @@ protected function checkintegrity()
                                 // It was just the QID....
                                 $sQID = $sDirtyQid;
                             }
-                            if ((string) intval($sQID) !== $sQID) {
-                                throw new \Exception('sQID is not an integer: ' . $sQID);
-                            }
 
                             // Here, we get the question as defined in backend
-                            $oQuestion = Question::model()->findByAttributes([ 'qid' => $sQID , 'sid' => $oSurvey->sid ]);
+                            try {
+                                $oQuestion = Question::model()->findByAttributes([ 'qid' => $sQID , 'language' => $oSurvey->language, 'sid' => $oSurvey->sid ]);
+                            } catch (Exception $e) {
+                                // QID potentially invalid , see #17458, reset $oQuestion
+                                $oQuestion = null;
+                            }
                             if (is_a($oQuestion, 'Question')) {
                                 // We check if its GID is the same as the one defined in the column name
                                 if ($oQuestion->gid != $sGid) {