VideoPlugin: correct merge with master

Leandro Santos
1 parent 010c1630
Showing 1 changed file with 1 additions and 2 deletions Show diff stats
plugins/video/lib/video_plugin/video_gallery_helper.rb
@@ -5,10 +5,9 @@ module VideoPlugin::VideoGalleryHelper
       configure[:list_type] ||= :folder
       if !configure[:contents].blank?
         configure[:contents] = configure[:contents].paginate(
-          :order => "updated_at DESC",
           :per_page => 17,
           :page => params[:npage]
-        )
+        ).order("updated_at DESC")
         render :file => 'shared/video_list', :locals => configure
       else
         content_tag('em', _('(empty folder)'))
...	...	@@ -5,10 +5,9 @@ module VideoPlugin::VideoGalleryHelper
5	5	configure[:list_type] \|\|= :folder
6	6	if !configure[:contents].blank?
7	7	configure[:contents] = configure[:contents].paginate(
8		- :order => "updated_at DESC",
9	8	:per_page => 17,
10	9	:page => params[:npage]
11		- )
	10	+ ).order("updated_at DESC")
12	11	render :file => 'shared/video_list', :locals => configure
13	12	else
14	13	content_tag('em', _('(empty folder)'))
...	...