mail/roundcube: chase PHP Warning: array_merge(): Argument #1 is not an array

Obtained from:  https://github.com/roundcube/Net_Sieve/commit/47419a26b6
This commit is contained in:
Pietro Cerutti
2016-03-01 14:49:05 +00:00
parent 6098148fd6
commit 42c3760abc
2 changed files with 12 additions and 0 deletions

View File

@@ -2,6 +2,7 @@
PORTNAME= roundcube
DISTVERSION= 1.1.4
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES?= mail www
MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:tu}

View File

@@ -0,0 +1,11 @@
--- vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php.orig 2016-03-01 14:32:07 UTC
+++ vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php
@@ -229,7 +229,7 @@ class Net_Sieve
$this->_sock = new Net_Socket();
$this->_bypassAuth = $bypassAuth;
$this->_useTLS = $useTLS;
- $this->_options = $options;
+ $this->_options = (array)$options;
$this->setDebug($debug, $handler);
/* Try to include the Auth_SASL package. If the package is not