Refactored video savings to permit change title and description when editing and...

diff --git a/actions/videolist/edit.php b/actions/videolist/edit.php
index 72e1d24279bfdd68f85337b481276facfbf6da67..6670ceadb33c9d0ad453d541dfb57f422cb70caa 100644 (file)
--- a/actions/videolist/edit.php
+++ b/actions/videolist/edit.php
@@ -25,16 +25,26 @@ elgg_make_sticky_form('videolist');
 \r
 elgg_load_library('elgg:videolist');\r
 \r
-if (!$input['video_url']) {\r
-       register_error(elgg_echo('videolist:error:no_url'));\r
-       forward(REFERER);\r
-}\r
+// If new video, get data from video providers\r
+if(!$video_guid) {\r
+       if (!$input['video_url']) {\r
+               register_error(elgg_echo('videolist:error:no_url'));\r
+               forward(REFERER);\r
+       }\r
 \r
-$parsed_url = videolist_parseurl($input['video_url']);\r
+       $parsed_url = videolist_parseurl($input['video_url']);\r
 \r
-if(!$parsed_url) {\r
-       register_error(elgg_echo('videolist:error:invalid_url'));\r
-       forward(REFERER);\r
+       if(!$parsed_url) {\r
+               register_error(elgg_echo('videolist:error:invalid_url'));\r
+               forward(REFERER);\r
+       }\r
+       \r
+       unset($input['title']);\r
+       unset($input['description']);\r
+       $input = array_merge(videolist_get_data($parsed_url), $input);\r
+       \r
+} else {\r
+       unset($input['video_url']);\r
 }\r
 \r
 if ($video_guid) {\r
@@ -50,8 +60,6 @@ if ($video_guid) {
        $new_video = true;\r
 }\r
 \r
-$input = array_merge($input, videolist_get_data($parsed_url));\r
-\r
 if (sizeof($input) > 0) {\r
        foreach ($input as $name => $value) {\r
                $video->$name = $value;\r

diff --git a/views/default/forms/videolist/edit.php b/views/default/forms/videolist/edit.php
index 8bbbcffb721a7d0308967a65f09b690b22e9b296..18fb6ded42a1bcb743bf3b48e0261d7e3d32bc6f 100644 (file)
--- a/views/default/forms/videolist/edit.php
+++ b/views/default/forms/videolist/edit.php
@@ -10,6 +10,8 @@ $variables = elgg_get_config('videolist');
 if(empty($vars['guid'])){
        unset($variables['title']);
        unset($variables['description']);
+} else {
+       unset($variables['video_url']);
 }
 
 foreach ($variables as $name => $type) {