From 297b3ea2277c6a9d14366cee760b452656c2af09 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Wed, 5 Mar 2014 23:24:10 +0100
Subject: [PATCH] Fixed issue #8812: Email attachments configuration is not
 saved

---
 .../controllers/admin/emailtemplates.php      |  2 +-
 .../emailtemplates/emailtemplates_view.php    | 22 -------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/application/controllers/admin/emailtemplates.php b/application/controllers/admin/emailtemplates.php
index ab30c5d7781..f0ff12e5c78 100644
--- 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
index 0b332e21891..c5f832f25af 100644
--- 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>