Merge branch 'master' of github.com:neocities/neocities

This commit is contained in:
Kyle Drake 2015-05-10 10:31:57 -07:00
commit 2b7a552b03
2 changed files with 2 additions and 1 deletions

2
app.rb
View file

@ -44,7 +44,7 @@ error do
from: 'web@neocities.org',
to: 'errors@neocities.org',
subject: "[Neocities Error] #{env['sinatra.error'].class}: #{env['sinatra.error'].message}",
body: erb(:'views/templates/email/error'),
body: erb(:'templates/email/error', layout: false),
no_footer: true
})

View file

@ -1,4 +1,5 @@
get '/surf/?' do
@current_page = params[:current_page].to_i || 1
params.delete 'tag' if params[:tag].nil? || params[:tag].strip.empty?
site_dataset = browse_sites_dataset
site_dataset = site_dataset.paginate @current_page, 1