Fixed issue #8812: Email attachments configuration is not saved

LimeSurvey · Mar 5, 2014 · 297b3ea · 297b3ea
1 parent c3d9329
commit 297b3ea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php
@@ -84,7 +84,7 @@ function index($iSurveyId)
      */
     function update($iSurveyId)
     {
-        $uploadUrl = Yii::app()->getBaseUrl(true) . Yii::app()->getConfig('uploadurl');
+        $uploadUrl = Yii::app()->getBaseUrl(true) . substr(Yii::app()->getConfig('uploadurl'),strlen(Yii::app()->getConfig('publicurl'))-1);
         // We need the real path since we check that the resolved file name starts with this path.
         $uploadDir = realpath(Yii::app()->getConfig('uploaddir'));
         $save=Yii::app()->request->getPost('save','');

diff --git a/application/views/admin/emailtemplates/emailtemplates_view.php b/application/views/admin/emailtemplates/emailtemplates_view.php
@@ -24,29 +24,7 @@
 
 
 </script>
-<style type="text/css">
 
-#emailtemplates table.attachments td, #emailtemplates button.add-attachment {
-    text-align: left;
-    margin: 2px 2px 2px 2px !important;
-
-}
-
-table.attachments td span{
-    border: 1px solid #999999;
-    display:block;
-}
-
-table.attachments img, table.attachments span{
-    height: 16px;
-    cursor: pointer;
-}
-ul.editor-parent {
-    overflow: hidden;
-}
-
-
-</style>
 <div class='header ui-widget-header'>
     <?php $clang->eT("Edit email templates"); ?>
 </div>