From 206aed825e48c7ccb441ba75efd847f003193161 Mon Sep 17 00:00:00 2001 From: Bracken Mosbacker Date: Mon, 25 Apr 2011 08:28:40 -0600 Subject: [PATCH] allow import/export without kaltura configured closes #4357 Change-Id: If1f7df936fbd012fcd26c0509b3b3f37188ca6f6 Reviewed-on: https://gerrit.instructure.com/3242 Reviewed-by: Brian Palmer Tested-by: Hudson --- app/models/media_object.rb | 1 + lib/cc/web_resources.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/media_object.rb b/app/models/media_object.rb index 3730acf95b9..94390419722 100644 --- a/app/models/media_object.rb +++ b/app/models/media_object.rb @@ -49,6 +49,7 @@ class MediaObject < ActiveRecord::Base # upload to complete. Wrap it in a timeout if you ever want it to give up # waiting. def self.add_media_files(attachments, wait_for_completion) + return unless Kaltura::ClientV3.config attachments = Array(attachments) client = Kaltura::ClientV3.new client.startSession(Kaltura::SessionType::ADMIN) diff --git a/lib/cc/web_resources.rb b/lib/cc/web_resources.rb index edf11d39ed6..09461efaf8d 100644 --- a/lib/cc/web_resources.rb +++ b/lib/cc/web_resources.rb @@ -35,6 +35,7 @@ module CC end def add_media_objects + return unless Kaltura::ClientV3.config client = Kaltura::ClientV3.new client.startSession(Kaltura::SessionType::ADMIN)