Merge branch 'master' of github.com:sixdegrees/oahu-php-client

sixdegrees · Apr 16, 2012 · a36b2a7 · a36b2a7
2 parents 26a3946 + 051244f
commit a36b2a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/example/config/example.ini b/example/config/example.ini
@@ -1,11 +1,11 @@
-host            = staging.api.oahu.fr
+host            = app.oahu.fr
 client_id       = YOUR_CLIENT_ID
 consumer_id     = YOUR_CONSUMER_ID
 consumer_secret = YOUR_CONSUMER_SECRET
 no_http_cache   = true
 
 oahu_env        = neue
-oahu_js_url     = http://js.oahu.neue.fr/dist/oahu.js
+oahu_js_url     = http://app.oahu.fr/assets/oahu.js
 
 [options]
 debug             = true

diff --git a/lib/OahuClient.php b/lib/OahuClient.php
@@ -35,10 +35,10 @@ function OahuConnection($oahuHost, $clientId, $consumerId, $consumerSecret, $noH
     $this->consumerId     = $consumerId;
     $this->noHttpCache    = $noHttpCache;
     if ($options) {
-      if ($options['debug']) {
+      if (isset($options['debug']) && $options['debug']) {
         $this->debug = array("http_hits" => 0, "cache_hits" => 0, "cache_misses" => 0);
       }
-      if ($options['cache']) {
+      if (isset($options['cache']) && $options['cache']) {
         $this->cache = new OahuCache($options['cache_host'], $options['cache_port'], $options['cache_expiration']);
       }
     }
@@ -200,7 +200,7 @@ function OahuClient($oahuHost="api.oahu.fr", $clientId, $consumerId, $consumerSe
       $this->consumerId     = $consumerId;
       $this->connection     = new OahuConnection($oahuHost, $clientId, $consumerId, $consumerSecret, $noHttpCache, $options);
       if ($options) {
-        if ($options['debug']) {
+        if (isset($options['debug']) && $options['debug']) {
           $this->debug = array();
         }
       }