From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports

---
 program/lib/Roundcube/rcube_plugin_api.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 179e7ef..704f416 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -95,7 +95,7 @@
 
         foreach ($this->plugins as $plugin) {
             // ... task, request type and framed mode
-            if (!$this->plugins_initialized[$plugin_name] && !$this->filter($plugin)) {
+            if (!$this->plugins_initialized[$plugin->ID] && !$this->filter($plugin)) {
                 $plugin->init();
                 $this->plugins_initialized[$plugin->ID] = $plugin;
             }
@@ -325,8 +325,8 @@
             // load additional information from local composer.lock file
             if ($lock = $composer_lock['installed'][$json['name']]) {
                 $info['version'] = $lock['version'];
-                $info['uri']     = $lock['homepage'] ? $lock['homepage'] : $lock['source']['uri'];
-                $info['src_uri'] = $lock['dist']['uri'] ? $lock['dist']['uri'] : $lock['source']['uri'];
+                $info['uri']     = $lock['homepage'] ?: $lock['source']['uri'];
+                $info['src_uri'] = $lock['dist']['uri'] ?: $lock['source']['uri'];
             }
         }
 

--
Gitblit v1.9.1