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

---
 installer/check.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/installer/check.php b/installer/check.php
index 84a2a3f..ee0c9f3 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -48,6 +48,7 @@
     // required for utils/modcss.inc, should we require this?
     'allow_url_fopen'  => 1,
     'date.timezone'    => '-VALID-',
+    'register_globals' => 0, // #1489157
 );
 
 $source_urls = array(

--
Gitblit v1.9.1