From 42bb65a75da1adb88f07d01677e2b80ee6b59039 Mon Sep 17 00:00:00 2001
From: Heshan Wanigasooriya <heshanmw@gmail.com>
Date: Sat, 8 Jan 2011 05:44:36 +0000
Subject: Adding namespace to the video module variables

---
 plugins/video_s3/filesystem/video_s3.inc              | 2 +-
 plugins/video_s3/video_s3.module                      | 2 +-
 plugins/video_zencoder/transcoders/video_zencoder.inc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/video_s3/filesystem/video_s3.inc b/plugins/video_s3/filesystem/video_s3.inc
index e103e1c..30f8033 100644
--- a/plugins/video_s3/filesystem/video_s3.inc
+++ b/plugins/video_s3/filesystem/video_s3.inc
@@ -104,7 +104,7 @@ class video_s3 extends video_filesystem {
     //lets show our buckets in table format with a delete link.
     //@todo add permissions
     //were enabled, that means they have successfully connected and created a bucket.
-    if (variable_get('amazon_s3_access_key', false) && variable_get('vid_filesystem', 'drupal') == 'video_s3') {
+    if (variable_get('amazon_s3_access_key', false) && variable_get('video_filesystem', 'drupal') == 'video_s3') {
       module_load_include('inc', 'video_s3', '/includes/amazon_s3');
       $s3 = new video_amazon_s3;
       $s3->connect();
diff --git a/plugins/video_s3/video_s3.module b/plugins/video_s3/video_s3.module
index 274da26..898a3eb 100644
--- a/plugins/video_s3/video_s3.module
+++ b/plugins/video_s3/video_s3.module
@@ -46,7 +46,7 @@ function video_s3_menu() {
  */
 
 function video_s3_cron() {
-  $filesystem = variable_get('vid_filesystem', 'drupal');
+  $filesystem = variable_get('video_filesystem', 'drupal');
   if ($filesystem == 'video_s3') {
     module_load_include('inc', 'video_s3', '/includes/amazon_s3');
     $s3 = new video_amazon_s3;
diff --git a/plugins/video_zencoder/transcoders/video_zencoder.inc b/plugins/video_zencoder/transcoders/video_zencoder.inc
index 0979d8f..db447ec 100644
--- a/plugins/video_zencoder/transcoders/video_zencoder.inc
+++ b/plugins/video_zencoder/transcoders/video_zencoder.inc
@@ -247,8 +247,8 @@ class video_zencoder implements transcoder_interface {
    */
   public function admin_settings_validate($form, &$form_state) {
     $zencoder_api = isset($form_state['values']['video_zencoder_api_key']) ? $form_state['values']['video_zencoder_api_key'] : NULL;
-    if (isset($zencoder_api) && !empty($zencoder_api) || $form_state['values']['vid_convertor'] != 'video_zencoder') {
-      if (variable_get('vid_filesystem', 'drupal') != 'video_s3') {
+    if (isset($zencoder_api) && !empty($zencoder_api) || $form_state['values']['video_convertor'] != 'video_zencoder') {
+      if (variable_get('video_filesystem', 'drupal') != 'video_s3') {
         form_set_error('video_zencoder', t('You must enable the Amazon S3 as !link.', array('!link' => l(t('FileSystem'), 'admin/settings/video/filesystem'))));
       }
       return;
-- 
cgit v1.2.3