Auto Commit

Ziggeo · Nov 3, 2018 · 141f767 · 141f767
1 parent 226f1f1
commit 141f767
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/README.md b/README.md
@@ -509,7 +509,6 @@ Arguments
 - client_can_index_videos: *Client is allowed to perform the index operation* 
 - client_cannot_access_unaccepted_videos: *Client cannot view unaccepted videos* 
 - enable_video_subpages: *Enable hosted video pages* 
-- enable_facebook: *Enable Facebook Support for hosted video pages* 
 
 
 #### Get Stats 

diff --git a/tests/app/ServerApiTestCase.php b/tests/app/ServerApiTestCase.php
@@ -24,7 +24,7 @@ private function init() {
 		if (!@$this->ziggeo)
 			$this->ziggeo = new Ziggeo(Globals::$CONFIG["application_token"], Globals::$CONFIG["private_key"]);
         if (@Globals::$CONFIG["config"])
-            $this->ziggeo->config()->config = Globals::$CONFIG["config"];
+            $this->ziggeo->config()->config = array_merge($this->ziggeo->config()->config, Globals::$CONFIG["config"]);
 		foreach ($this->ziggeo->videos()->index(array("states" => "all")) as $video)
 			$this->ziggeo->videos()->delete($video->token);
 	}