[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46555] branches/11.x

[<jon...@us...>]

Revision: 46555
          http://sourceforge.net/p/tikiwiki/code/46555
Author:   jonnybradley
Date:     2013-07-05 16:33:13 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
[FIX] kaltura: Test kaltura_kcwUIConf properly on admin page, and catch "SERVICE_FORBIDDEN" exceptions properly and present the message politely (and while trying to fix that the error just disappeared!)

Modified Paths:
--------------
    branches/11.x/admin/include_video.php
    branches/11.x/lib/videogals/kalturalib.php

Modified: branches/11.x/admin/include_video.php
===================================================================
--- branches/11.x/admin/include_video.php	2013-07-05 13:42:08 UTC (rev 46554)
+++ branches/11.x/admin/include_video.php	2013-07-05 16:33:13 UTC (rev 46555)
@@ -16,6 +16,7 @@
 
 	if ($kalturaadminlib->getSessionKey()) {
 		// contribution wizard
+		$kcwDefault = $prefs['kaltura_kcwUIConf'];
 		if (empty($kcwDefault) || !empty($_REQUEST['kcw_rebuild'])) {
 			$kcwDefault = $kalturaadminlib->updateStandardTikiKcw();
 		}

Modified: branches/11.x/lib/videogals/kalturalib.php
===================================================================
--- branches/11.x/lib/videogals/kalturalib.php	2013-07-05 13:42:08 UTC (rev 46554)
+++ branches/11.x/lib/videogals/kalturalib.php	2013-07-05 16:33:13 UTC (rev 46555)
@@ -159,7 +159,12 @@
 		$cachelib = TikiLib::lib('cache');
 
 		if (! $configurations = $cachelib->getSerialized(self::CONFIGURATION_LIST)) {
-			$obj = $this->_getPlayersUiConfs()->objects;
+			try {
+				$obj = $this->_getPlayersUiConfs()->objects;
+			} catch (Exception $e) {
+				TikiLib::lib('errorreport')->report($e->getMessage());
+				return array();
+			}
 			$configurations = array();
 			foreach ($obj as $o) {
 				$configurations[] = get_object_vars($o);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.