diff options
| author | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
|---|---|---|
| committer | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
| commit | d9c042c4c536f1afbf206aeea09b0b127b7b6418 (patch) | |
| tree | 9d7ef18c6d9d4c8f8f4d1c9a5dbfceeb9fd5acf4 /config.php-dist | |
| parent | cf42b79120290ee5866136a0c4656e6999f06045 (diff) | |
| parent | 4ca621a36016de1fbb5447e1c1de0b607ba94a7c (diff) | |
Merge branch 'master' into patch-1
Conflicts:
locale/de_DE/LC_MESSAGES/messages.po
Diffstat (limited to 'config.php-dist')
| -rw-r--r-- | config.php-dist | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.php-dist b/config.php-dist index 0c3e92b74..c0729b61b 100644 --- a/config.php-dist +++ b/config.php-dist @@ -177,9 +177,9 @@ // *** Other settings (less important) *** // *************************************** - define('CHECK_FOR_NEW_VERSION', true); - // Check for new versions of tt-rss automatically. - + define('CHECK_FOR_UPDATES', true); + // Check for updates automatically if running Git version + define('DETECT_ARTICLE_LANGUAGE', false); // Detect article language when updating feeds, presently this is only // used for hyphenation. This may increase amount of CPU time used by @@ -193,7 +193,7 @@ // if you experience weird errors and tt-rss failing to start, blank pages // after login, or content encoding errors, disable it. - define('PLUGINS', 'auth_internal, note, updater'); + define('PLUGINS', 'auth_internal, note'); // Comma-separated list of plugins to load automatically for all users. // System plugins have to be specified here. Please enable at least one // authentication plugin here (auth_*). |