diff options
| author | ale <ale@FreeBSD.org> | 2013-05-27 21:47:51 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2013-05-27 21:47:51 +0800 |
| commit | fcc0b35145d9582f017be0e7746da87839317e41 (patch) | |
| tree | d9978b185800101228906111b1a49d8c1b16657c /mail/roundcube | |
| parent | c1e45de3da9e40d14169b66d0893ee9fe88f791d (diff) | |
| download | freebsd-ports-gnome-fcc0b35145d9582f017be0e7746da87839317e41.tar.gz freebsd-ports-gnome-fcc0b35145d9582f017be0e7746da87839317e41.tar.zst freebsd-ports-gnome-fcc0b35145d9582f017be0e7746da87839317e41.zip | |
Commit forgotten patches.
Diffstat (limited to 'mail/roundcube')
| -rw-r--r-- | mail/roundcube/files/patch-program_include_iniset.php | 10 | ||||
| -rw-r--r-- | mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php | 8 |
2 files changed, 4 insertions, 14 deletions
diff --git a/mail/roundcube/files/patch-program_include_iniset.php b/mail/roundcube/files/patch-program_include_iniset.php deleted file mode 100644 index 014c1b7f682d..000000000000 --- a/mail/roundcube/files/patch-program_include_iniset.php +++ /dev/null @@ -1,10 +0,0 @@ ---- program/include/iniset.php.orig 2013-04-15 22:42:21.000000000 +0200 -+++ program/include/iniset.php 2013-05-07 12:40:34.000000000 +0200 -@@ -28,7 +28,6 @@ - // Some users are not using Installer, so we'll check some - // critical PHP settings here. Only these, which doesn't provide - // an error/warning in the logs later. See (#1486307). -- 'suhosin.session.encrypt' => 0, - 'session.auto_start' => 0, - 'file_uploads' => 1, - ); diff --git a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php index 1854ea3038c1..4c719300dc49 100644 --- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php +++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php @@ -1,5 +1,5 @@ ---- program/lib/Roundcube/rcube_session.php.orig 2013-04-15 22:42:22.000000000 +0200 -+++ program/lib/Roundcube/rcube_session.php 2013-05-07 12:49:19.000000000 +0200 +--- program/lib/Roundcube/rcube_session.php.orig 2013-05-16 20:06:31.000000000 +0200 ++++ program/lib/Roundcube/rcube_session.php 2013-05-27 15:46:41.000000000 +0200 @@ -33,7 +33,6 @@ private $start; private $changed; @@ -55,8 +55,8 @@ - if (is_array($a_oldvars)) { - // remove unset keys on oldvars - foreach ((array)$this->unsets as $var) { -- if (isset($a_oldvars[$k])) { -- unset($a_oldvars[$k]); +- if (isset($a_oldvars[$var])) { +- unset($a_oldvars[$var]); - } - else { - $path = explode('.', $var); |