Remove js that crept back in, added another error string.

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 3e6ff151895c4e9c57af20e74dee3b8f040372ed..02976a2ae2c20f84d44a3db0660d4bcf5226ffbb 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -279,6 +279,8 @@ class NewnoticeAction extends Action
             } else {
                 $this->clientError(_('There was a database error while saving your file. Please try again.'));
             }
+        } else {
+            $this->clientError(_('File could not be moved to destination directory.'));
         }
     }
 

diff --git a/js/util.js b/js/util.js
index acf44a17c78d9f27fb8cadb76b290652b7dbef9c..bffbf916fa0df6aa3d9c6f4886af5362dc2b5978 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -28,30 +28,6 @@ $(document).ready(function(){
         }
     });
 
-    $('a.attachment').click(function() {$().jOverlay({url: $('address .url')[0].href+'/attachment/' + ($(this).attr('id').substring('attachment'.length + 1)) + '/ajax'}); return false; });
-    $("a.thumbnail").hover(
-        function() {
-            var anchor = $(this);
-            $("a.thumbnail").children('img').remove();
-
-            setTimeout(function() {
-                anchor.closest(".entry-title").addClass('ov');
-                $.get($('address .url')[0].href+'/attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
-                    anchor.append(data);
-                });
-            }, 250);
-
-            setTimeout(function() {
-                anchor.children('img').remove();
-                anchor.closest(".entry-title").removeClass('ov');
-            }, 3000);
-        },
-        function() {
-            $(this).children('img').remove();
-            $(this).closest(".entry-title").removeClass('ov');
-        }
-    );
-
        // count character on keyup
        function counter(event){
                var maxLength = 140;

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 898be1bb008b3fbf9a655791d3323d559d0124ea..45e4fa319687761ee9dc31d3b617b7cfc18a2e5e 100644 (file)
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -83,7 +83,7 @@ class AttachmentList extends Widget
         $atts = new File;
         $att = $atts->getAttachments($this->notice->id);
         if (empty($att)) return 0;
-        $this->out->elementStart('dl', array('id' =>'attachment'));
+        $this->out->elementStart('dl', array('id' =>'attachments'));
         $this->out->element('dt', null, _('Attachments'));
         $this->out->elementStart('dd');
         $this->out->elementStart('ol', array('class' => 'attachments'));