public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 21:35:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git

Browse Source
This commit is contained in:
Barak Korren
2013-04-02 20:38:07 +03:00
parent e470a273cf cc33260343
commit 58a2577d48
882 changed files with 15341 additions and 168396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions.php
View File

@@ -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"]);