starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-31 10:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-regexless' into dev-regexless

Browse Source
This commit is contained in:
Darko
2015-06-23 14:04:03 +02:00
parent e35effaba9 ff315b3574
commit 70c4e4e5d7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
newznab/controllers/NameFixer.php
+2 -2
View File
@@ -152,7 +152,7 @@ class NameFixer
$this->category = ($options['Categorize'] instanceof Categorize ? $options['Categorize'] : new Categorize(['Settings' => $this->pdo]));
$this->utility = ($options['Utility'] instanceof Utility ? $options['Utility'] : new Utility());
$this->_groups = ($options['Groups'] instanceof Groups ? $options['Groups'] : new Groups(['Settings' => $this->pdo]));
$this->sphinx = ($options['SphinxSearch'] instanceof \SphinxSearch ? $options['SphinxSearch'] : new \SphinxSearch());
$this->sphinx = ($options['SphinxSearch'] instanceof SphinxSearch ? $options['SphinxSearch'] : new SphinxSearch());
}
/**
@@ -373,7 +373,7 @@ class NameFixer
* @param int $cats 1: other categories, 2: all categories
* @param string $query Query to execute.
*
* @return PDOStatement|bool False on failure, PDOStatement with query results on success.
* @return \PDOStatement|bool False on failure, PDOStatement with query results on success.
*/
protected function _getReleases($time, $cats, $query)
{
newznab/controllers/ReleaseCleaning.php
+2 -2
View File
@@ -77,7 +77,7 @@ class ReleaseCleaning
protected $_regexes;
/**
* @param DB $settings
* @param Settings $settings
*/
public function __construct($settings = null)
{
@@ -86,7 +86,7 @@ class ReleaseCleaning
$this->e1 = \CollectionsCleaning::REGEX_FILE_EXTENSIONS . \CollectionsCleaning::REGEX_END;
$this->e2 = \CollectionsCleaning::REGEX_FILE_EXTENSIONS .
\CollectionsCleaning::REGEX_SUBJECT_SIZE . \CollectionsCleaning::REGEX_END;
$this->pdo = ($settings instanceof newznab\db\Settings ? $settings : new newznab\db\Settings());
$this->pdo = ($settings instanceof Settings ? $settings : new Settings());
$this->_regexes = new Regexes(['Settings' => $this->pdo, 'Table_Name' => 'release_naming_regexes']);
}