From a823096b449c301732a1a2ce469c56caa7d9b1e9 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Fri, 6 Jul 2012 18:15:03 +0100
Subject: [PATCH] If $options is not equal to null then overwrite default
 options

---
 src/oauth2server/Server.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/oauth2server/Server.php b/src/oauth2server/Server.php
index a97f20e2..fee789fd 100644
--- a/src/oauth2server/Server.php
+++ b/src/oauth2server/Server.php
@@ -41,6 +41,9 @@ class Server
     public function __construct(array $options)
     {
         $this->options = array_merge($this->config, $options);
+        if ($options !== null) {
+            $this->options = array_merge($this->config, $options);
+        }
     }
 
     public function registerDbAbstractor(object $db)