summaryrefslogtreecommitdiff
path: root/classes/feeds.php
diff options
context:
space:
mode:
authorBarak Korren <[email protected]>2013-04-02 20:38:07 +0300
committerBarak Korren <[email protected]>2013-04-02 20:38:07 +0300
commit58a2577d48790c79adfd44bcfd662c980ce6cfe4 (patch)
tree523d814ea0b7b6f617fe515b186099c6e83fed72 /classes/feeds.php
parente470a273cf09562fb2f9c0c899002303f19c8d16 (diff)
parentcc332603431102a682feda22b9cf0093a29f0176 (diff)
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git
Diffstat (limited to 'classes/feeds.php')
-rw-r--r--classes/feeds.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index 0c643325f..778850fc4 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -739,7 +739,7 @@ class Feeds extends Handler_Protected {
break;
default:
if ($feed < LABEL_BASE_INDEX) {
- $message = __("No articles found to display. You can assign articles to labels manually (see the Actions menu above) or use a filter.");
+ $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
} else {
$message = __("No articles found to display.");
}
@@ -796,7 +796,7 @@ class Feeds extends Handler_Protected {
$feed = db_escape_string($this->link, $_REQUEST["feed"]);
$method = db_escape_string($this->link, $_REQUEST["m"]);
$view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]);
- $limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT");
+ $limit = 30;
@$cat_view = $_REQUEST["cat"] == "true";
@$next_unread_feed = db_escape_string($this->link, $_REQUEST["nuf"]);
@$offset = db_escape_string($this->link, $_REQUEST["skip"]);