Merge pull request #54 from machaven/master

Fixed issue #6882: Renaming a template lose the parameters of a questionnaire.
LimeSurvey · Nov 20, 2012 · 05889db · 05889db
2 parents e3d0b5a + 2e8cc2b
commit 05889db
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
@@ -398,7 +398,8 @@ public function templaterename()
     {
         if (returnGlobal('action') == "templaterename" && returnGlobal('newname') && returnGlobal('copydir')) {
             $clang = Yii::app()->lang;
-            $newname=sanitize_paranoid_string(returnGlobal('newname'));
+            $oldname = sanitize_paranoid_string(returnGlobal('copydir'));
+            $newname = sanitize_paranoid_string(returnGlobal('newname'));
             $newdirname = Yii::app()->getConfig('usertemplaterootdir') . "/" . $newname;
             $olddirname = Yii::app()->getConfig('usertemplaterootdir') . "/" . returnGlobal('copydir');
             if (isStandardTemplate(returnGlobal('newname')))
@@ -407,8 +408,8 @@ public function templaterename()
                 $this->getController()->error(sprintf($clang->gT("Directory could not be renamed to `%s`.", "js"), $newname) . " " . $clang->gT("Maybe you don't have permission.", "js"));
             else
             {
-                $templatename = $newname;
-                $this->index("startpage.pstpl", "welcome", $templatename);
+                Survey::model()->updateAll(array( 'template' => $newname ), "template = '{$oldname}'" );
+                $this->index("startpage.pstpl", "welcome", $newname);
             }
         }
     }