From 9df7e17043e241b5e3d1d4739ff6d24fdeecc205 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 21 Jun 2013 03:34:47 -0400
Subject: [PATCH] Disable workaround for http://bugs.php.net/bug.php?id=18556 if PHP 5.5 is detected

---
 program/include/iniset.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/program/include/iniset.php b/program/include/iniset.php
index 913d3d7..919cc76 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -60,6 +60,11 @@
 // register autoloader for rcmail app classes
 spl_autoload_register('rcmail_autoload');
 
+// include composer autoloader (if available)
+if (file_exists('vendor/autoload.php')) {
+    require 'vendor/autoload.php';
+}
+
 // backward compatybility (to be removed)
 require_once INSTALL_PATH . 'program/include/bc.php';
 

--
Gitblit v1.9.1