From 534241ca236bf8da7145c3cc31c035fb1f9e5918 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Tue, 5 May 2015 12:04:37 +0200 Subject: [PATCH] don't error when viewing an empty feed --- controllers/controllers.php | 18 +++++++++++++----- views/entries.php | 4 ++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/controllers/controllers.php b/controllers/controllers.php index 8d2864c..3c24f56 100644 --- a/controllers/controllers.php +++ b/controllers/controllers.php @@ -264,18 +264,26 @@ $app->get('/:domain', function($domain) use($app) { } $entries = $entries->limit($per_page)->order_by_desc('published')->find_many(); - $older = ORM::for_table('entries')->where('user_id', $user->id) - ->where_lt('id', $entries[count($entries)-1]->id)->order_by_desc('published')->find_one(); + if(count($entries) > 1) { + $older = ORM::for_table('entries')->where('user_id', $user->id) + ->where_lt('id', $entries[count($entries)-1]->id)->order_by_desc('published')->find_one(); + } else { + $older = null; + } - $newer = ORM::for_table('entries')->where('user_id', $user->id) - ->where_gte('id', $entries[0]->id)->order_by_asc('published')->offset($per_page)->find_one(); + if(count($entries) > 1) { + $newer = ORM::for_table('entries')->where('user_id', $user->id) + ->where_gte('id', $entries[0]->id)->order_by_asc('published')->offset($per_page)->find_one(); + } else { + $newer = null; + } if(!$newer) { // no new entry was found at the specific offset, so find the newest post to link to instead $newer = ORM::for_table('entries')->where('user_id', $user->id) ->order_by_desc('published')->limit(1)->find_one(); - if($newer->id == $entries[0]->id) + if($newer && $newer->id == $entries[0]->id) $newer = false; } diff --git a/views/entries.php b/views/entries.php index df618fc..009a852 100644 --- a/views/entries.php +++ b/views/entries.php @@ -8,6 +8,10 @@ + entries) == 0): ?> +
There are no entries yet!
+ +