Fixed issues and errors in survey deactivation

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10786 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 19, 2011 · b1f2fdb · b1f2fdb
1 parent 2766c52
commit b1f2fdb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/application/controllers/admin/survey.php b/application/controllers/admin/survey.php
@@ -353,8 +353,6 @@ function deactivate($surveyid)
 
 	   self::_getAdminHeader();
 	   self::_showadminmenu($surveyid);
-	   self::_surveybar($surveyid);
-
 
         //$postsid=returnglobal('sid');
         if ($this->input->post('sid'))
@@ -388,6 +386,7 @@ function deactivate($surveyid)
             $data['date'] = $date;
             $data['dbprefix'] = $this->db->dbprefix;
             $data['step1'] = true;
+            self::_surveybar($surveyid);
             $this->load->view('admin/Survey/deactivateSurvey_view',$data);
         }
 
@@ -413,6 +412,8 @@ function deactivate($surveyid)
                     $deactivateresult = db_execute_assosc($setidx) or die ("Could not alter the index for this token table. <br /><br />Survey was not deactivated either.<br /><br /><a href='".site_url('admin/survey/view/'.$postsid)."'>".$clang->gT("Main Admin Screen")."</a>");
 
                 }
+                $data['tnewtable'] = $tnewtable;
+                $data['toldtable'] = $toldtable;
             }
 
             // IF there are any records in the saved_control table related to this survey, they have to be deleted
@@ -511,8 +512,8 @@ function deactivate($surveyid)
 
             $data['clang'] = $clang;
             $data['surveyid'] = $surveyid;
-            $data['tnewtable'] = $tnewtable;
-            $data['toldtable'] = $toldtable;
+            $data['newtable'] = $newtable;
+            self::_surveybar($surveyid);
             $this->load->view('admin/Survey/deactivateSurvey_view',$data);
 
         }