From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 plugins/userinfo/userinfo.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/userinfo/userinfo.php b/plugins/userinfo/userinfo.php
index 0f1b18c..efb65f5 100644
--- a/plugins/userinfo/userinfo.php
+++ b/plugins/userinfo/userinfo.php
@@ -6,7 +6,9 @@
  */
 class userinfo extends rcube_plugin
 {
-  public $task = 'settings';
+  public $task    = 'settings';
+  public $noajax  = true;
+  public $noframe = true;
 
   function init()
   {
@@ -50,4 +52,4 @@
     return html::tag('h4', null, Q('Infos for ' . $user->get_username())) . $table->show();
   }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1