From 3bbe4e7424f12b4f870fb775b8230714a2862380 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 19 Jun 2013 13:52:33 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
plugins/acl/acl.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 28139e9..5940626 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -148,6 +148,7 @@
// Load localization and include scripts
$this->load_config();
+ $this->specials = $this->rc->config->get('acl_specials', $this->specials);
$this->add_texts('localization/', array('deleteconfirm', 'norights',
'nouser', 'deleting', 'saving'));
$this->include_script('acl.js');
--
Gitblit v1.9.1