canned: Fix crash editing canned responses with attachments

include/class.canned.php

@@ -110,8 +110,7 @@ class Canned {
                 'attachments__type'=>'C',
                 'attachments__object_id'=>$this->getId(),
                 'attachments__inline' => $inlines,
-            ))
-            ->all();
+            ));
     }
 
     function getNumFilters() {

include/class.forms.php

@@ -2241,6 +2241,10 @@ class FileUploadField extends FormField {
         return $this->attachments ? $this->attachments->getAll() : array();
     }
 
+    function setAttachments(GenericAttachments $att) {
+        $this->attachments = $att;
+    }
+
     function getConfiguration() {
         $config = parent::getConfiguration();
         $_types = self::getFileTypes();

include/staff/cannedresponse.inc.php

@@ -93,11 +93,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 </div>
                 <?php
                 $attachments = $canned_form->getField('attachments');
-                if ($canned && ($files=$canned->getAttachedFiles())) {
-                    $ids = array();
-                    foreach ($files as $f)
-                        $ids[] = $f->id;
-                    $attachments->value = $ids;
+                if ($canned) {
+                    $attachments->setAttachments($canned->attachments);
+                    if ($files = $canned->getAttachedFiles()) {
+                        $ids = $files->values_flat('id')->all();
+                        $attachments->value = $ids;
+                    }
                 }
                 print $attachments->render(); ?>
                 <br/>

scp/canned.php

@@ -50,8 +50,8 @@ if ($_POST) {
                 $keepers = $canned_form->getField('attachments')->getClean();
                 $attachments = $canned->attachments->getSeparates(); //current list of attachments.
                 foreach($attachments as $k=>$file) {
-                    if($file['id'] && !in_array($file['id'], $keepers)) {
-                        $canned->attachments->delete($file['id']);
+                    if(isset($file->id) && !in_array($file->id, $keepers)) {
+                        $canned->attachments->delete($file->id);
                     }
                 }