From: Andrew Dolgov <gothfox@users.noreply.github.com>
Date: Wed, 15 Oct 2014 07:58:19 +0000 (+0400)
Subject: Merge pull request #413 from cmehay/master
X-Git-Tag: 1.14~3
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=3a008ecc769c8b3062a786c74af10d2048a12fda;hp=5d678429615e09956cf32958c601b15bc84df74f

Merge pull request #413 from cmehay/master

Removing required attribute from database password field
---

diff --git a/classes/handler/public.php b/classes/handler/public.php
index e89318c6..34d57744 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -39,11 +39,10 @@ class Handler_Public extends Handler {
 
 		//function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false) {
 
-
 		$qfh_ret = queryFeedHeadlines($feed,
 			1, $view_mode, $is_cat, $search, $search_mode,
 			$date_sort_field, $offset, $owner_uid,
-			false, 0, false, true, false, false, $start_ts);
+			false, 0, true, true, false, false, $start_ts);
 
 		$result = $qfh_ret[0];
 
@@ -64,7 +63,7 @@ class Handler_Public extends Handler {
 		$qfh_ret = queryFeedHeadlines($feed,
 			$limit, $view_mode, $is_cat, $search, $search_mode,
 			$date_sort_field, $offset, $owner_uid,
-			false, 0, false, true, false, false, $start_ts);
+			false, 0, true, true, false, false, $start_ts);
 
 
 		$result = $qfh_ret[0];
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 43b47427..d70c1a26 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -495,7 +495,7 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
 
 		if (is_file($icon_file) && $feed_id) {
-			if (filesize($icon_file) < 20000) {
+			if (filesize($icon_file) < 65535) {
 
 				$result = $this->dbh->query("SELECT id FROM ttrss_feeds
 					WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
@@ -738,9 +738,9 @@ class Pref_Feeds extends Handler_Protected {
 			<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
 			<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
 			<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
-			<button dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
+			<button class=\"small\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
 				type=\"submit\">".__('Replace')."</button>
-			<button dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+			<button class=\"small\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
 				type=\"submit\">".__('Remove')."</button>
 			</form>";
 
diff --git a/css/dijit.css b/css/dijit.css
index bd51929a..eb4f767d 100644
--- a/css/dijit.css
+++ b/css/dijit.css
@@ -346,6 +346,10 @@ button[disabled],
 	line-height : 20px;
 }
 
+.claro .dijitButton.small .dijitButtonText {
+	font-size : 11px;
+}
+
 .claro .dijitMenu {
 	border-color : #ccc;
 }