From: Chuck Hagenbuch Date: Wed, 24 Nov 2010 15:29:59 +0000 (-0500) Subject: Make sure $opts is an array before sorting it X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=745c206c125cf236acf380a5336d3af22bcdc3e5;p=horde.git Make sure $opts is an array before sorting it --- diff --git a/framework/Vcs/lib/Horde/Vcs.php b/framework/Vcs/lib/Horde/Vcs.php index 3ade2d59b..f01c559b8 100644 --- a/framework/Vcs/lib/Horde/Vcs.php +++ b/framework/Vcs/lib/Horde/Vcs.php @@ -587,6 +587,7 @@ class Horde_Vcs { $class = 'Horde_Vcs_Patchset_' . $this->_driver; + if (!is_array($opts)) { $opts = array(); } ksort($opts); $cacheId = implode('|', array($class, $this->sourceroot(), serialize($opts), $this->_cacheVersion)); @@ -638,5 +639,4 @@ class Horde_Vcs { return 'HEAD'; } - }