From e85bbc9e9c577efd4437a032463d4fd79da932b5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 10 Sep 2015 10:57:12 -0400
Subject: [PATCH] random_bytes() can throw an exception in some cases, since PHP 7.0.0rc3
---
program/include/iniset.php | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index b2cad42..3044e0e 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-2014, The Roundcube Dev Team |
+ | Copyright (C) 2008-2015, 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.1-git');
+define('RCMAIL_VERSION', '1.2-git');
define('RCMAIL_START', microtime(true));
if (!defined('INSTALL_PATH')) {
@@ -55,8 +55,8 @@
@set_time_limit(120);
// include composer autoloader (if available)
-if (@file_exists('vendor/autoload.php')) {
- require 'vendor/autoload.php';
+if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) {
+ require INSTALL_PATH . 'vendor/autoload.php';
}
// include Roundcube Framework
@@ -67,12 +67,6 @@
// backward compatybility (to be removed)
require_once INSTALL_PATH . 'program/include/bc.php';
-
-// load the UTF-8 portablity layer from Patchwor
-if (!function_exists('iconv') || !function_exists('utf8_encode') || !extension_loaded('mbstring')) {
- \Patchwork\Utf8\Bootup::initAll();
-}
-
/**
* PHP5 autoloader routine for dynamic class loading
--
Gitblit v1.9.1