From 4585e371857636c1dece9978fba65d978a3afc78 Mon Sep 17 00:00:00 2001 From: Sem Date: Sat, 12 Nov 2011 01:25:31 +0100 Subject: Refactored video savings to permit change title and description when editing and avoid to change url. --- actions/videolist/edit.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'actions') diff --git a/actions/videolist/edit.php b/actions/videolist/edit.php index 72e1d2427..6670ceadb 100644 --- a/actions/videolist/edit.php +++ b/actions/videolist/edit.php @@ -25,16 +25,26 @@ elgg_make_sticky_form('videolist'); elgg_load_library('elgg:videolist'); -if (!$input['video_url']) { - register_error(elgg_echo('videolist:error:no_url')); - forward(REFERER); -} +// If new video, get data from video providers +if(!$video_guid) { + if (!$input['video_url']) { + register_error(elgg_echo('videolist:error:no_url')); + forward(REFERER); + } -$parsed_url = videolist_parseurl($input['video_url']); + $parsed_url = videolist_parseurl($input['video_url']); -if(!$parsed_url) { - register_error(elgg_echo('videolist:error:invalid_url')); - forward(REFERER); + if(!$parsed_url) { + register_error(elgg_echo('videolist:error:invalid_url')); + forward(REFERER); + } + + unset($input['title']); + unset($input['description']); + $input = array_merge(videolist_get_data($parsed_url), $input); + +} else { + unset($input['video_url']); } if ($video_guid) { @@ -50,8 +60,6 @@ if ($video_guid) { $new_video = true; } -$input = array_merge($input, videolist_get_data($parsed_url)); - if (sizeof($input) > 0) { foreach ($input as $name => $value) { $video->$name = $value; -- cgit v1.2.3