diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php index ffc3f127ba1..c0f84f4d8d2 100644 --- a/application/helpers/admin/activate_helper.php +++ b/application/helpers/admin/activate_helper.php @@ -26,7 +26,7 @@ function fixNumbering($fixnumbering, $iSurveyID) LimeExpressionManager::RevertUpgradeConditionsToRelevance($iSurveyID); //Fix a question id - requires renumbering a question $oldqid = (int) $fixnumbering; - $lastqid=Questions::model()->getMaxId('qid', true); // Always refresh as we insert new qid's + $lastqid=Question::model()->getMaxId('qid', true); // Always refresh as we insert new qid's $newqid=$lastqid+1; // Not sure we can do this in MSSQL ? diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php index e07a3662332..9b7c03a4ed5 100644 --- a/application/helpers/admin/import_helper.php +++ b/application/helpers/admin/import_helper.php @@ -2948,7 +2948,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= if ($qtypes[$questionrowdata['type']]['subquestions']<2) { $aInsertData=array('qid'=>$aQIDReplacements[$oldqid],'code'=>$labelrow['code'],'answer'=>$labelrow['title'],'sortorder'=>$labelrow['sortorder'],'language'=>$labelrow['language'],'assessment_value'=>$labelrow['assessment_value']); - Answers::model()->insertRecords($aInsertData) or safeDie($clang->gT("Error").": Failed to insert data [4]
"); + Answer::model()->insertRecords($aInsertData) or safeDie($clang->gT("Error").": Failed to insert data [4]
"); } else { @@ -3148,7 +3148,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks= $asrowdata["sid"]=$iNewSID; unset($asrowdata["id"]); - $result=Assessments::model()->insertRecords($asrowdata) or safeDie("Couldn't insert assessment
"); + $result=Assessment::model()->insertRecords($asrowdata) or safeDie("Couldn't insert assessment
"); unset($newgid); } diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 3d90f2de3fd..bf5076d000b 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -723,7 +723,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, $qaid=$aQuestionInfo['aid']; //get question data - $nresult = Questions::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$qqid)); + $nresult = Question::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$qqid)); $qtitle=$nresult->title; $qtype=$nresult->type; $qquestion=flattenText($nresult->question);