From owner-svn-ports-all@FreeBSD.ORG  Mon May 27 13:47:53 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A769C3D2;
 Mon, 27 May 2013 13:47:53 +0000 (UTC) (envelope-from ale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 99F8F371;
 Mon, 27 May 2013 13:47:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RDlqgE010919;
 Mon, 27 May 2013 13:47:52 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RDlqbf010918;
 Mon, 27 May 2013 13:47:52 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201305271347.r4RDlqbf010918@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Mon, 27 May 2013 13:47:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319242 - head/mail/roundcube/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 13:47:53 -0000

Author: ale
Date: Mon May 27 13:47:51 2013
New Revision: 319242
URL: http://svnweb.freebsd.org/changeset/ports/319242

Log:
  Commit forgotten patches.

Deleted:
  head/mail/roundcube/files/patch-program_include_iniset.php
Modified:
  head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php

Modified: head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
==============================================================================
--- head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php	Mon May 27 13:36:43 2013	(r319241)
+++ head/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php	Mon May 27 13:47:51 2013	(r319242)
@@ -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);