diff options
| author | Barak Korren <[email protected]> | 2013-04-02 20:38:07 +0300 |
|---|---|---|
| committer | Barak Korren <[email protected]> | 2013-04-02 20:38:07 +0300 |
| commit | 58a2577d48790c79adfd44bcfd662c980ce6cfe4 (patch) | |
| tree | 523d814ea0b7b6f617fe515b186099c6e83fed72 /include/functions.php | |
| parent | e470a273cf09562fb2f9c0c899002303f19c8d16 (diff) | |
| parent | cc332603431102a682feda22b9cf0093a29f0176 (diff) | |
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git
Diffstat (limited to 'include/functions.php')
| -rw-r--r-- | include/functions.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php index 039048095..d99f6a64b 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,6 +1,6 @@ <?php define('EXPECTED_CONFIG_VERSION', 26); - define('SCHEMA_VERSION', 114); + define('SCHEMA_VERSION', 115); define('LABEL_BASE_INDEX', -1024); define('PLUGIN_FEED_BASE_INDEX', -128); @@ -84,6 +84,7 @@ "ru_RU" => "Русский", "pt_BR" => "Portuguese/Brazil", "zh_CN" => "Simplified Chinese", + "sv_SE" => "Svenska", "fi_FI" => "Suomi"); return $tr; @@ -1860,7 +1861,7 @@ foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS", "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP", - "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "DEFAULT_ARTICLE_LIMIT", + "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) { $params[strtolower($param)] = (int) get_pref($link, $param); @@ -1954,6 +1955,11 @@ "help_dialog" => __("Show help dialog")) ); + global $pluginhost; + foreach ($pluginhost->get_hooks($pluginhost::HOOK_HOTKEY_INFO) as $plugin) { + $hotkeys = $plugin->hook_hotkey_info($hotkeys); + } + return $hotkeys; } @@ -3426,6 +3432,8 @@ $parent_insert = "NULL"; } + $feed_cat = mb_substr($feed_cat, 0, 250); + $result = db_query($link, "SELECT id FROM ttrss_feed_categories WHERE $parent_qpart AND title = '$feed_cat' AND owner_uid = ".$_SESSION["uid"]); |