Merge branch 'dev'

NNTmux · Oct 3, 2018 · 092987c · 092987c
2 parents ae2768c + d92f467
commit 092987c
Show file tree

Hide file tree

Showing 36 changed files with 129 additions and 132 deletions.
diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php
@@ -529,7 +529,6 @@ public function __destruct()
      * @param string $groupID
      * @param string $guidChar
      *
-     * @throws \Blacklight\processing\post\ProcessAdditionalException
      * @throws \Exception
      */
     public function start($groupID = '', $guidChar = ''): void
@@ -563,7 +562,6 @@ public function start($groupID = '', $guidChar = ''): void
      * @param string $groupID
      * @throws \RuntimeException
      * @throws \Exception
-     * @throws \Blacklight\processing\post\ProcessAdditionalException
      */
     protected function _setMainTempPath(&$guidChar, &$groupID = ''): void
     {
@@ -592,7 +590,7 @@ protected function _setMainTempPath(&$guidChar, &$groupID = ''): void
         }
 
         if (! is_dir($this->_mainTmpPath)) {
-            throw new ProcessAdditionalException('Could not create the tmpunrar folder ('.$this->_mainTmpPath.')');
+            throw new \RuntimeException('Could not create the tmpunrar folder ('.$this->_mainTmpPath.')');
         }
 
         $this->_clearMainTmpPath();

diff --git a/Blacklight/processing/post/ProcessAdditionalException.php b/Blacklight/processing/post/ProcessAdditionalException.php
diff --git a/Changelog b/Changelog
@@ -1,3 +1,9 @@
+2018-10-03 DariusIII
+	* Chg: Update symfony components to their latest versions
+	* Fix: Remove stray whitespace in X-DNZB-NFO header sent on nzb download. Fixes issue #735
+	* Chg: Update exception handling in ProcessAdditional class and related scripts
+	* Chg: Increase number of pages listed on each side of pagers current page
+	* Chg: Update mockery/mockery to version 1.2.0
 2018-10-02 DariusIII
 	* Fix: Fix wrong link to tvdb banners
 	* Chg: Update laravel/framework to version 5.7.7 and imdbphp/imdbphp to version 6.0.4

diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php
@@ -133,7 +133,7 @@ public function getNzb(Request $request)
         }
 
         if ((int) $relData['nfostatus'] === 1) {
-            $headers += ['X-DNZB-NFO ' => url('/').'/nfo/'.$request->input('id')];
+            $headers += ['X-DNZB-NFO' => url('/').'/nfo/'.$request->input('id')];
         }
 
         $headers += ['X-DNZB-RCode' => '200',