Merge branch 'patch-1' of git://github.com/renan/horde

horde · Nov 27, 2014 · 69c855f · 69c855f
2 parents e458ea5 + 2ad5877
commit 69c855f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/framework/Mime/lib/Horde/Mime/Headers/MessageId.php b/framework/Mime/lib/Horde/Mime/Headers/MessageId.php
@@ -21,7 +21,7 @@
  * @package   Mime
  * @since     2.5.0
  */
-class Horde_Mime_Headers_Messageid
+class Horde_Mime_Headers_MessageId
 extends Horde_Mime_Headers_Identification
 {
     /**

diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
@@ -2565,7 +2565,13 @@ var DimpBase = {
             if (!this.viewport.getMetaData('nodelete')) {
                 r = sel.get('dataob');
                 if (e.shiftKey) {
-                    this.moveSelected((r.last().VP_rownum == this.viewport.getMetaData('total_rows')) ? (r.first().VP_rownum - 1) : (r.last().VP_rownum + 1), true);
+                    this.moveSelected(
+                        (r.last().VP_rownum == this.viewport.getMetaData('total_rows'))
+                            ? (r.first().VP_rownum - 1)
+                            : (r.last().VP_rownum + 1),
+                        true,
+                        true
+                    );
                 }
                 this.deleteMsg({ vs: sel });
             }

diff --git a/imp/lib/Ftree.php b/imp/lib/Ftree.php
@@ -758,7 +758,7 @@ protected function _insertElt($elt)
 
         $change = false;
         if (isset($this->_elts[$name])) {
-            if ($elt['a'] && self::ELT_NOSELECT) {
+            if ($elt['a'] & self::ELT_NOSELECT) {
                 return;
             }
             $change = true;