Fixed issue #7750: Expression manager don't found default attribute

Dev: fixed max files to 1 by default too Dev: rewrite getQuestionAttributeValues and move it to QuestionAttribute::model Dev: rewrite LimeExpressionManager::getQuestionAttributesForEM()
LimeSurvey · Apr 11, 2013 · 38d78a2 · 38d78a2
1 parent a0e95ba
commit 38d78a2
Show file tree

Hide file tree

Showing 5 changed files with 1,521 additions and 1,330 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -492,12 +492,15 @@ function index($sa = null)
                         }
                         if (returnGlobal('copyattributes') == "Y")
                         {
-                            $r1 = QuestionAttribute::model()->getQuestionAttributes(returnGlobal('oldqid'));
-                            while($qr1 = $r1->read())
+                            $oOldAttributes = QuestionAttribute::model()->findAll("qid=:qid",array("qid"=>returnGlobal('oldqid')));
+                            foreach($oOldAttributes as $oOldAttribute)
                             {
-                                $qr1['qid']=$qid;
-                                unset($qr1['qaid']);
-                                QuestionAttribute::model()->insertRecords($qr1);
+                                $attribute = new QuestionAttribute;
+                                $attribute->qid = $qid;
+                                $attribute->value = $oOldAttribute->value;
+                                $attribute->attribute = $oOldAttribute->attribute;
+                                $attribute->language = $oOldAttribute->language;
+                                $attribute->save();
                             }
                         }
                     } else {
@@ -510,7 +513,7 @@ function index($sa = null)
                             if ($validAttribute['i18n'])
                             {
                                 foreach ($aLanguages as $sLanguage)
-                                {// TODO sanitise XSS
+                                {
                                     $value=Yii::app()->request->getPost($validAttribute['name'].'_'.$sLanguage);
                                     $result = QuestionAttribute::model()->findAllByAttributes(array('attribute'=>$validAttribute['name'], 'qid'=>$qid, 'language'=>$sLanguage));
                                     if (count($result)>0)