From efdbbafdba18a3452f89fab7ce80d197647216f1 Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Wed, 24 Aug 2011 14:39:46 +0800 Subject: [PATCH] Revert "MDL-28509 repository_youtube Enable selection of sort order" This reverts commit 88bf951aa753ff789872c062fe4fa14fb7e39973. --- .../youtube/lang/en/repository_youtube.php | 5 ---- repository/youtube/lib.php | 27 ++----------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/repository/youtube/lang/en/repository_youtube.php b/repository/youtube/lang/en/repository_youtube.php index dfee1f8df81..22d80e866ff 100644 --- a/repository/youtube/lang/en/repository_youtube.php +++ b/repository/youtube/lang/en/repository_youtube.php @@ -27,8 +27,3 @@ $string['pluginname'] = 'Youtube videos'; $string['search'] = 'Search videos'; $string['youtube:view'] = 'Use youtube in file picker'; $string['configplugin'] = 'YouTube repository type configuration'; -$string['sortby'] = 'Sort By'; -$string['sortpublished'] = 'Date Published'; -$string['sortrating'] = 'Rating'; -$string['sortrelevance'] = 'Relevance'; -$string['sortviewcount'] = 'View Count'; diff --git a/repository/youtube/lib.php b/repository/youtube/lib.php index 30a5f076bbd..67166dfe0ac 100644 --- a/repository/youtube/lib.php +++ b/repository/youtube/lib.php @@ -31,7 +31,7 @@ class repository_youtube extends repository { $this->keyword = optional_param('youtube_keyword', '', PARAM_RAW); $this->start =1; $this->max = 27; - $this->sort = optional_param('youtube_sort', '', PARAM_TEXT); + $this->sort = 'published'; parent::__construct($repositoryid, $context, $options); } @@ -92,30 +92,7 @@ class repository_youtube extends repository { $search->id = 'youtube_search'; $search->name = 'youtube_keyword'; $search->label = get_string('search', 'repository_youtube').': '; - $sort = new stdClass(); - $sort->type = 'select'; - $sort->options = array( - (object)array( - 'value' => 'relevance', - 'label' => get_string('sortrelevance', 'repository_youtube') - ), - (object)array( - 'value' => 'published', - 'label' => get_string('sortpublished', 'repository_youtube') - ), - (object)array( - 'value' => 'rating', - 'label' => get_string('sortrating', 'repository_youtube') - ), - (object)array( - 'value' => 'viewCount', - 'label' => get_string('sortviewcount', 'repository_youtube') - ) - ); - $sort->id = 'youtube_sort'; - $sort->name = 'youtube_sort'; - $sort->label = get_string('sortby', 'repository_youtube').': '; - $ret['login'] = array($search, $sort); + $ret['login'] = array($search); $ret['login_btn_label'] = get_string('search'); $ret['login_btn_action'] = 'search'; return $ret;