From 9adf6ba4fb3342940c046794baf69d9289a0f41b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 10 May 2015 09:17:32 +0000 Subject: [PATCH 1/3] fix error email --- app.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.rb b/app.rb index bedf3554..32deb81f 100644 --- a/app.rb +++ b/app.rb @@ -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 }) @@ -55,4 +55,4 @@ error do erb :'error' end -Dir['./app/**/*.rb'].each {|f| require f} +://neocities.org/surf?current_page=3&sort_by=newest&tag=ir['./app/**/*.rb'].each {|f| require f} From 021589d7dc124e79eb8d6963e3b730e2b8bc0a14 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 10 May 2015 09:21:25 +0000 Subject: [PATCH 2/3] not sure how that happened... --- app.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.rb b/app.rb index 32deb81f..47b005f4 100644 --- a/app.rb +++ b/app.rb @@ -55,4 +55,4 @@ error do erb :'error' end -://neocities.org/surf?current_page=3&sort_by=newest&tag=ir['./app/**/*.rb'].each {|f| require f} +Dir['./app/**/*.rb'].each {|f| require f} From ecc0085f3304fc27bcec2a9b204871a1793f8dfd Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 10 May 2015 09:48:20 +0000 Subject: [PATCH 3/3] fix for surf pagination --- app/surf.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/surf.rb b/app/surf.rb index a02ad46e..95d819db 100644 --- a/app/surf.rb +++ b/app/surf.rb @@ -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