Index: admin/database.php
===================================================================
--- admin/database.php	(revision 9976)
+++ admin/database.php	(working copy)
@@ -927,6 +927,7 @@
         //Determine ids by evaluating the hidden field
         $rows=array();
         $codes=array();
+        $oldcodes=array();
         foreach ($_POST as $postkey=>$postvalue)
         {
             $postkey=explode('_',$postkey);
@@ -938,6 +939,10 @@
             {
                 $codes[$postkey[2]][]=$postvalue;
             }
+            if ($postkey[0]=='oldcode')
+            {
+                $oldcodes[$postkey[2]][]=$postvalue;
+            }
         }
         $count=0;
         $invalidCode = 0;
@@ -972,6 +977,12 @@
                     {
                         $query='Update '.db_table_name('questions').' set question_order='.($position+1).', title='.db_quoteall($codes[$scale_id][$position]).', question='.db_quoteall($subquestionvalue).', scale_id='.$scale_id.' where qid='.db_quoteall($subquestionkey).' AND language='.db_quoteall($language);
                         $connect->execute($query);
+
+                        if($codes[$scale_id][$position] !== $oldcodes[$scale_id][$position]) {
+                            $query='UPDATE '.db_table_name('conditions').' SET cfieldname="+'.$surveyid.'X'.$gid.'X'.$qid.db_quote($codes[$scale_id][$position]).'" WHERE cfieldname="+'.$surveyid.'X'.$gid.'X'.$qid.db_quote($oldcodes[$scale_id][$position]).'"';
+                            $connect->execute($query);
+                        }
+
                     }
                     else
                     {
Index: admin/editsubquestions.php
===================================================================
--- admin/editsubquestions.php	(revision 9976)
+++ admin/editsubquestions.php	(working copy)
@@ -195,7 +195,7 @@
                 }
                 elseif ($activated != 'Y' && $first) // If survey is decactivated
                 {
-                    $vasummary .= "<img class='handle' src='$imageurl/handle.png' /></td><td><input type='text' id='code_{$row['qid']}_{$row['scale_id']}' class='code' name='code_{$row['qid']}_{$row['scale_id']}' value=\"{$row['title']}\" maxlength='5' size='5'"
+                    $vasummary .= "<img class='handle' src='$imageurl/handle.png' /></td><td><input type='hidden' class='oldcode' id='oldcode_{$row['qid']}_{$row['scale_id']}' name='oldcode_{$row['qid']}_{$row['scale_id']}' value=\"{$row['title']}\" /><input type='text' id='code_{$row['qid']}_{$row['scale_id']}' class='code' name='code_{$row['qid']}_{$row['scale_id']}' value=\"{$row['title']}\" maxlength='5' size='5'"
                     ." onkeypress=\" if(event.keyCode==13) {if (event && event.preventDefault) event.preventDefault(); document.getElementById('saveallbtn_$anslang').click(); return false;} return goodchars(event,'1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ_')\""
                     ." />";