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/debug_logger/debug_logger.php | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
index f04ba6a..87a1637 100644
--- a/plugins/debug_logger/debug_logger.php
+++ b/plugins/debug_logger/debug_logger.php
@@ -15,7 +15,7 @@
* Enable the plugin in config/main.inc.php and add your desired
* log types and files.
*
- * @version 1.0
+ * @version @package_version@
* @author Ziba Scott
* @website http://roundcube.net
*
@@ -106,12 +106,15 @@
if(!isset($args[1])){
// This could be extended to detect types based on the
- // file which called console. For now only rcube_imap.inc is supported
+ // file which called console. For now only rcube_imap/rcube_storage is supported
$bt = debug_backtrace();
$file = $bt[3]['file'];
switch(basename($file)){
case 'rcube_imap.php':
$type = 'imap';
+ break;
+ case 'rcube_storage.php':
+ $type = 'storage';
break;
default:
$type = FALSE;
@@ -139,8 +142,9 @@
return $args;
}
- function __destruct(){
- $this->runlog->end();
+ function __destruct()
+ {
+ if ($this->runlog)
+ $this->runlog->end();
}
}
-?>
--
Gitblit v1.9.1