fixed handling of transactions and stream_wrapper options

videlalvaro · Aug 15, 2011 · 53d54c9 · 53d54c9
1 parent 8358d85
commit 53d54c9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Jackalope/Repository.php b/src/Jackalope/Repository.php
@@ -53,7 +53,7 @@ public function __construct(Factory $factory = null, TransportInterface $transpo
     {
         $this->factory = is_null($factory) ? new Factory : $factory;
         $this->transport = $transport;
-        $this->options = array_merge((array)$options, $this->options);
+        $this->options = array_merge($this->options, (array)$options);
         $this->options['transactions'] = $this->options['transactions'] && $transport instanceof TransactionalTransportInterface;
         // register a stream wrapper to lazily load binary property values
         if (null === self::$binaryStreamWrapperRegistered) {