Merge branch 'IX-9.12.0' of https://github.com/kaltura/server into IX…

…-9.12.0
guoyu07 · Mar 4, 2014 · b97ea8f · b97ea8f
2 parents 647b228 + 152dfd9
commit b97ea8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php b/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php
@@ -448,7 +448,8 @@ protected function initSilverLightManifest($flavorAssets)
 		}
 		else
 		{
-			$this->storageId = $remoteFileSync->getDc();
+			if($remoteFileSync)
+				$this->storageId = $remoteFileSync->getDc();
 			$this->manifestFileSync = $remoteFileSync;
 		}
 

diff --git a/configurations/admin.template.ini b/configurations/admin.template.ini
@@ -199,7 +199,7 @@ moduls.entitlement.group = GROUP_ENABLE_DISABLE_FEATURES
 
 moduls.categoryLimit.enabled = true
 moduls.categoryLimit.permissionType = 2
-moduls.categoryLimit.label = Disble Category Limit
+moduls.categoryLimit.label = Disable Category Limit
 moduls.categoryLimit.permissionName = FEATURE_DISABLE_CATEGORY_LIMIT
 moduls.categoryLimit.basePermissionType =
 moduls.categoryLimit.basePermissionName =