wait #7345 @2

diff --git a/framework/library/CubeIT/View/Helper/VideoGeneric.php b/framework/library/CubeIT/View/Helper/VideoGeneric.php
index 7dcc4acd6730e2bbdcf792ead0993c87b347958c..21fe13eeecf449f4285ca2c7ad44f6b044636c0d 100644 (file)
--- a/framework/library/CubeIT/View/Helper/VideoGeneric.php
+++ b/framework/library/CubeIT/View/Helper/VideoGeneric.php
@@ -3,7 +3,7 @@
 class CubeIT_View_Helper_VideoGeneric extends CubeIT_View_Helper_VideoWebIframe {
 
        public function videoGeneric($videoId, $width = "100%", $ratio = 'auto', $options = array(), $attributes = array()) {
 class CubeIT_View_Helper_VideoGeneric extends CubeIT_View_Helper_VideoWebIframe {
 
        public function videoGeneric($videoId, $width = "100%", $ratio = 'auto', $options = array(), $attributes = array()) {

-               $url = CubeIT_Util_WebVideo::getIframeUrl('generic', $videoId, $options);
+               $url = $videoId;

                if (!$url) {
                        return;
                }
                if (!$url) {
                        return;
                }

diff --git a/framework/library/CubeIT/View/Helper/VideoWeb.php b/framework/library/CubeIT/View/Helper/VideoWeb.php
index 452853657dc1ece125a2c81aafd4da7cd7a60ebb..7a02632d32e9b8426f5ad09316f852cecbfcd81e 100644 (file)
--- a/framework/library/CubeIT/View/Helper/VideoWeb.php
+++ b/framework/library/CubeIT/View/Helper/VideoWeb.php
@@ -18,9 +18,13 @@ class CubeIT_View_Helper_VideoWeb extends CubeIT_View_Helper_VideoWebIframe
             if ($strict) {
                 return false;
             }
             if ($strict) {
                 return false;
             }

-            return $this->videoWebIframe($url, $width, $ratio, $options, $attributes);
+            return $this->videoHtml5($url, $width, $ratio, $options, $attributes);

         } else {
             list($service, $videoId) = explode(':', $urlf);
         } else {
             list($service, $videoId) = explode(':', $urlf);

+            if(!$videoId){
+                $videoId = $service;
+                $service = 'html5';
+            }

             if ($service === 'http' || $service === 'https') {
                 $service = 'generic';
                 $videoId = $urlf;
             if ($service === 'http' || $service === 'https') {
                 $service = 'generic';
                 $videoId = $urlf;