From 10ea10a3177fb59caac13adc44cfbc4b5e6ff8dd Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 20 May 2011 14:35:08 -0400
Subject: [PATCH] Catch write-errors on database (yet untested)
---
installer/utils.php | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/installer/utils.php b/installer/utils.php
index 54221dd..fd7e93b 100644
--- a/installer/utils.php
+++ b/installer/utils.php
@@ -1,10 +1,10 @@
<?php
/*
+-------------------------------------------------------------------------+
- | RoundCube Webmail IMAP Client |
+ | Roundcube Webmail IMAP Client |
| Version 0.3-20090702 |
| |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
| |
| This program is free software; you can redistribute it and/or modify |
| it under the terms of the GNU General Public License version 2 |
@@ -29,28 +29,16 @@
/**
* Use PHP5 autoload for dynamic class loading
- * (copy from program/incllude/iniset.php)
+ * (copy from program/include/iniset.php)
*/
function __autoload($classname)
{
$filename = preg_replace(
- array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
- array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+ array('/MDB2_(.+)/', '/Mail_(.+)/', '/Net_(.+)/', '/^html_.+/', '/^utf8$/'),
+ array('MDB2/\\1', 'Mail/\\1', 'Net/\\1', 'html', 'utf8.class'),
$classname
);
include_once $filename. '.php';
-}
-
-
-/**
- * Shortcut function for htmlentities()
- *
- * @param string String to quote
- * @return string The html-encoded string
- */
-function Q($string)
-{
- return htmlentities($string, ENT_COMPAT, 'UTF-8');
}
@@ -62,5 +50,3 @@
$rci = rcube_install::get_instance();
$rci->raise_error($p);
}
-
-
--
Gitblit v1.9.1