Merge remote branch 'upstream/develop' into 1.10.x

include/class.forms.php

@@ -3974,10 +3974,7 @@ class FileUploadWidget extends Widget {
         // Files already attached to the field are allowed
         foreach ($this->field->getFiles() as $F) {
             // FIXME: This will need special porting in v1.10
-            if ($F instanceof Attachment)
-                $allowed[$F->getFileId()] = 1;
-            else
-                $allowed[$F->id] = 1;
+            $allowed[$F->id] = 1;
         }
 
         // New files uploaded in this session are allowed

include/staff/templates/thread-event.tmpl.php

+<?php if ($desc = $event->getDescription(ThreadEvent::MODE_STAFF)) { ?>
 <div class="thread-event <?php if ($event->uid) echo 'action'; ?>">
         <span class="type-icon">
           <i class="faded icon-<?php echo $event->getIcon(); ?>"></i>
         </span>
         <span class="faded description">
-            <?php echo $event->getDescription(ThreadEvent::MODE_STAFF); ?>
+            <?php echo $desc; ?>
         </span>
 </div>
+<?php } ?>

scp/css/scp.css

@@ -2930,3 +2930,12 @@ a.attachment {
  */
 .select2-selection__rendered, .select2-search,
 .select2-search__field:not([placeholder='']){width: 100% !important;}
+/* Fix Canned Responses Select2 Height */
+#resp_sec .select2-results, #resp_sec .select2-results__choices {
+    height: auto;
+    max-height: 400px !important;
+}
+#select2-cannedResp-results {
+    height: auto;
+    max-height: 400px !important;
+}