From 8ecda4ee0896e4729fe8a09fe0f3b5dd4f342e99 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 9 May 2018 10:50:21 +0200 Subject: [PATCH] Fix links() error on rest of the cover related pages --- Changelog | 1 + app/Http/Controllers/AdultController.php | 7 ++++++- app/Http/Controllers/BooksController.php | 7 ++++++- app/Http/Controllers/ConsoleController.php | 7 ++++++- app/Http/Controllers/MusicController.php | 7 ++++++- resources/views/themes/Charisma/books.tpl | 2 +- resources/views/themes/Charisma/console.tpl | 2 +- resources/views/themes/Charisma/music.tpl | 2 +- resources/views/themes/Charisma/xxx.tpl | 2 +- resources/views/themes/Gentele/books.tpl | 2 +- resources/views/themes/Gentele/console.tpl | 2 +- resources/views/themes/Gentele/music.tpl | 2 +- resources/views/themes/Gentele/xxx.tpl | 2 +- resources/views/themes/Omicron/books.tpl | 2 +- resources/views/themes/Omicron/console.tpl | 2 +- resources/views/themes/Omicron/music.tpl | 2 +- resources/views/themes/Omicron/xxx.tpl | 2 +- 17 files changed, 37 insertions(+), 16 deletions(-) diff --git a/Changelog b/Changelog index 5b6cb96ca..f080cf218 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-09 DariusIII + * Fix: Fix links() error on rest of the cover related pages * Fix: Fix links() array error on movies page * Chg: Use <> operator instead of != in query builder * Chg: Update maintenance mode handling when updating nntmux diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index 30568e061..33b3e92fc 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -86,7 +86,12 @@ class AdultController extends BasePageController $this->smarty->assign('orderby'.$ordertype, WWW_TOP.'/xxx?t='.$category.$browseby_link.'&ob='.$ordertype.'&offset=0'); } - $this->smarty->assign('results', $movies); + $this->smarty->assign( + [ + 'resultsadd'=> $movies, + 'results' => $results, + ] + ); $meta_title = 'Browse XXX'; $meta_keywords = 'browse,xxx,nzb,description,details'; diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index 064203832..c0261f143 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -86,7 +86,12 @@ class BooksController extends BasePageController $this->smarty->assign('orderby'.$ordertype, WWW_TOP.'/books?t='.$category.$browseby_link.'&ob='.$ordertype.'&offset=0'); } - $this->smarty->assign('results', $books); + $this->smarty->assign( + [ + 'resultsadd'=> $books, + 'results' => $results, + ] + ); $meta_title = 'Browse Books'; $meta_keywords = 'browse,nzb,books,description,details'; diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index d88745364..8705aca05 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -89,7 +89,12 @@ class ConsoleController extends BasePageController } } - $this->smarty->assign('results', $consoles); + $this->smarty->assign( + [ + 'resultsadd'=> $consoles, + 'results' => $results, + ] + ); $meta_title = 'Browse Console'; $meta_keywords = 'browse,nzb,console,games,description,details'; diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index 97f64d167..4e3da5b9d 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -90,7 +90,12 @@ class MusicController extends BasePageController } } - $this->smarty->assign('results', $musics); + $this->smarty->assign( + [ + 'resultsadd'=> $musics, + 'results' => $results, + ] + ); $meta_title = 'Browse Albums'; $meta_keywords = 'browse,nzb,albums,description,details'; diff --git a/resources/views/themes/Charisma/books.tpl b/resources/views/themes/Charisma/books.tpl index a2e67f5c5..3fd782033 100755 --- a/resources/views/themes/Charisma/books.tpl +++ b/resources/views/themes/Charisma/books.tpl @@ -53,7 +53,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Charisma/console.tpl b/resources/views/themes/Charisma/console.tpl index c4839e2be..cdbb706f2 100755 --- a/resources/views/themes/Charisma/console.tpl +++ b/resources/views/themes/Charisma/console.tpl @@ -63,7 +63,7 @@
{$results->links()}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Charisma/music.tpl b/resources/views/themes/Charisma/music.tpl index 6b12f51d0..6a33e53cb 100755 --- a/resources/views/themes/Charisma/music.tpl +++ b/resources/views/themes/Charisma/music.tpl @@ -52,7 +52,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Charisma/xxx.tpl b/resources/views/themes/Charisma/xxx.tpl index bcc65d805..5a289d787 100755 --- a/resources/views/themes/Charisma/xxx.tpl +++ b/resources/views/themes/Charisma/xxx.tpl @@ -53,7 +53,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result} {if isset($result.category_name)} {assign var="catnamesplit" value=">"|explode:$result.category_name} diff --git a/resources/views/themes/Gentele/books.tpl b/resources/views/themes/Gentele/books.tpl index 51b39aac1..77e0bd9dd 100755 --- a/resources/views/themes/Gentele/books.tpl +++ b/resources/views/themes/Gentele/books.tpl @@ -60,7 +60,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Gentele/console.tpl b/resources/views/themes/Gentele/console.tpl index 1214706b8..cad952026 100755 --- a/resources/views/themes/Gentele/console.tpl +++ b/resources/views/themes/Gentele/console.tpl @@ -63,7 +63,7 @@
{$results->links()}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Gentele/music.tpl b/resources/views/themes/Gentele/music.tpl index 03cd5428f..6c6d9a547 100755 --- a/resources/views/themes/Gentele/music.tpl +++ b/resources/views/themes/Gentele/music.tpl @@ -58,7 +58,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Gentele/xxx.tpl b/resources/views/themes/Gentele/xxx.tpl index 27119d24d..c316a2dd1 100755 --- a/resources/views/themes/Gentele/xxx.tpl +++ b/resources/views/themes/Gentele/xxx.tpl @@ -59,7 +59,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result} {if isset($result.category_name)} {assign var="catnamesplit" value=">"|explode:$result.category_name} diff --git a/resources/views/themes/Omicron/books.tpl b/resources/views/themes/Omicron/books.tpl index 533d251c8..673c2a090 100755 --- a/resources/views/themes/Omicron/books.tpl +++ b/resources/views/themes/Omicron/books.tpl @@ -53,7 +53,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Omicron/console.tpl b/resources/views/themes/Omicron/console.tpl index e1f7b6ddc..5eb0a9cdf 100755 --- a/resources/views/themes/Omicron/console.tpl +++ b/resources/views/themes/Omicron/console.tpl @@ -65,7 +65,7 @@ {$results->links()}
{/if} - {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Omicron/music.tpl b/resources/views/themes/Omicron/music.tpl index 7c7357773..1ebe31a8f 100755 --- a/resources/views/themes/Omicron/music.tpl +++ b/resources/views/themes/Omicron/music.tpl @@ -52,7 +52,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result}
diff --git a/resources/views/themes/Omicron/xxx.tpl b/resources/views/themes/Omicron/xxx.tpl index 470905702..97352731a 100755 --- a/resources/views/themes/Omicron/xxx.tpl +++ b/resources/views/themes/Omicron/xxx.tpl @@ -53,7 +53,7 @@ {/if}
- {foreach $results as $result} + {foreach $resultsadd as $result} {if isset($result.category_name)} {assign var="catnamesplit" value=">"|explode:$result.category_name}