From 77b5d7ee304a688a2eb115ce04b460b43c0dd700 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 08:43:54 -0400
Subject: [PATCH] Fix priority icon(s) position
---
program/include/iniset.php | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index d91b314..6db710b 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -1,11 +1,11 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| program/include/iniset.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2015, The Roundcube Dev Team |
+ | Copyright (C) 2008-2016, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -21,7 +21,7 @@
*/
// application constants
-define('RCMAIL_VERSION', '1.2-git');
+define('RCMAIL_VERSION', '1.2.0');
define('RCMAIL_START', microtime(true));
if (!defined('INSTALL_PATH')) {
@@ -65,17 +65,8 @@
// register autoloader for rcmail app classes
spl_autoload_register('rcmail_autoload');
-// backward compatybility (to be removed)
+// backward compatybility (to be removed in version 1.2.0)
require_once INSTALL_PATH . 'program/include/bc.php';
-
-// load the UTF-8 portability layers from Patchwork
-// don't load mbstring layer as it conflicts with Roundcube Framework (#1490280)
-if (!function_exists('iconv')) {
- \Patchwork\Utf8\Bootup::initIconv();
-}
-if (!function_exists('utf8_encode')) {
- \Patchwork\Utf8\Bootup::initUtf8Encode();
-}
/**
* PHP5 autoloader routine for dynamic class loading
--
Gitblit v1.9.1