diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php index 8551adb01..e65b768c5 100755 --- a/Blacklight/processing/post/ProcessAdditional.php +++ b/Blacklight/processing/post/ProcessAdditional.php @@ -421,17 +421,17 @@ class ProcessAdditional $this->_echoCLI = ($options['Echo'] && config('nntmux.echocli') && (strtolower(PHP_SAPI) === 'cli')); - $this->_nntp = $options['NNTP'] instanceof NNTP ? $options['NNTP'] : new NNTP(['Echo' => $this->_echoCLI]); + $this->_nntp = $options['NNTP'] ?? new NNTP(['Echo' => $this->_echoCLI]); - $this->_nzb = $options['NZB'] instanceof NZB ? $options['NZB'] : new NZB(); + $this->_nzb = $options['NZB'] ?? new NZB(); $this->_archiveInfo = new ArchiveInfo(); - $this->_categorize = $options['Categorize'] instanceof Categorize ? $options['Categorize'] : new Categorize(); - $this->_nameFixer = $options['NameFixer'] instanceof NameFixer ? $options['NameFixer'] : new NameFixer(['Echo' =>$this->_echoCLI, 'Groups' => null, 'Categorize' => $this->_categorize]); - $this->_releaseExtra = $options['ReleaseExtra'] instanceof ReleaseExtra ? $options['ReleaseExtra'] : new ReleaseExtra(); - $this->_releaseImage = $options['ReleaseImage'] instanceof ReleaseImage ? $options['ReleaseImage'] : new ReleaseImage(); + $this->_categorize = $options['Categorize'] ?? new Categorize(); + $this->_nameFixer = $options['NameFixer'] ?? new NameFixer(['Echo' =>$this->_echoCLI, 'Categorize' => $this->_categorize]); + $this->_releaseExtra = $options['ReleaseExtra'] ?? new ReleaseExtra(); + $this->_releaseImage = $options['ReleaseImage'] ?? new ReleaseImage(); $this->_par2Info = new Par2Info(); - $this->_nfo = $options['Nfo'] instanceof Nfo ? $options['Nfo'] : new Nfo(); - $this->sphinx = $options['SphinxSearch'] instanceof SphinxSearch ? $options['SphinxSearch'] : new SphinxSearch(); + $this->_nfo = $options['Nfo'] ?? new Nfo(); + $this->sphinx = $options['SphinxSearch'] ?? new SphinxSearch(); $this->ffmpeg = FFMpeg::create(['timeout' => Settings::settingValue('..timeoutseconds')]); $this->ffprobe = FFProbe::create(); $this->mediaInfo = new MediaInfo(); diff --git a/Changelog b/Changelog index 40879f63f..7e0b2f9ac 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-03-01 DariusIII + * Chg: Update PPA class * Chg: Remove unused parts of fixtures and seeders * Chg: Update nesbot/carbon (2.14.1 => 2.14.2) * Chg: Add back jrean/laravel-user-verification and remove customized fork