Fixed issue #5082: Group id of subquestion is not changed to new gid …

…when copying question with subquestions to new group git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9966 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Apr 5, 2011 · 744615c · 744615c
1 parent a1b8f68
commit 744615c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/admin/database.php b/admin/database.php
@@ -733,6 +733,7 @@ function get_max_question_order($gid)
                         $oldqid=$qr1['qid'];
                         unset($qr1['qid']);
                     }
+                    $qr1['gid']=$postgid;
                     $sInsertSQL = $connect->GetInsertSQL($tablename,$qr1);
                     $ir1 = $connect->Execute($sInsertSQL);   // Checked
                     if (isset($qr1['qid']))
@@ -1491,13 +1492,13 @@ function Updatedefaultvalues($qid,$sqid,$scale_id,$specialtype,$language,$defaul
    else
    {
        $exists=$connect->GetOne("SELECT qid FROM ".db_table_name('defaultvalues')." WHERE sqid=$sqid AND qid=$qid AND specialtype=$specialtype'' AND scale_id={$scale_id} AND language='{$language}'");
-       if (is_null($exists))
+       if ($exists===false)
        {
            $connect->execute('INSERT INTO '.db_table_name('defaultvalues')." (defaultvalue,qid,scale_id,language,specialtype,sqid) VALUES (".db_quoteall($defaultvalue,$ispost).",{$qid},{$scale_id},'{$language}','{$specialtype}',{$sqid})");        
        }
        else
        {
-           $connect->execute('Update '.db_table_name('defaultvalues')." set defaultvalue=".db_quoteall($defaultvalue,$ispost)."  WHERE sqid=$sqid AND qid=$qid AND specialtype='' AND scale_id={$scale_id} AND language='{$language}'");        
+           $connect->execute('UPDATE '.db_table_name('defaultvalues')." set defaultvalue=".db_quoteall($defaultvalue,$ispost)."  WHERE sqid={$sqid} AND qid={$qid} AND specialtype='{$specialtype}' AND scale_id={$scale_id} AND language='{$language}'");        
        }
    }
 }