diff options
| -rw-r--r-- | actions/videolist/edit.php | 28 | ||||
| -rw-r--r-- | views/default/forms/videolist/edit.php | 2 |
2 files changed, 20 insertions, 10 deletions
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;
diff --git a/views/default/forms/videolist/edit.php b/views/default/forms/videolist/edit.php index 8bbbcffb7..18fb6ded4 100644 --- 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) { |