disable headlines pagination (add hidden pref _PREFS_ENABLE_PAGINATION)

functions.php

@@ -3043,10 +3043,13 @@
 					<li class=\"top\"><a href=\"$catchup_page_link\">".__('Mark as read')."</a><ul>
 						<li onclick=\"$catchup_page_link\">".__('This page')."</li>
 						<li onclick=\"$catchup_feed_link\">".__('Entire feed')."</li></ul></li>
-					<li class=\"vsep\">&nbsp;</li>";
+					";
 
-					if ($limit != 0 && !$search) {
+					$enable_pagination = get_pref($link, "_PREFS_ENABLE_PAGINATION");
+
+					if ($limit != 0 && !$search && $enable_pagination) {
 						print "
+						<li class=\"vsep\">&nbsp;</li>
 						<li class=\"top\"><a href=\"$page_next_link\">".__('Next page')."</a><ul>
 							<li onclick=\"$page_prev_link\">".__('Previous page')."</li>
 							<li onclick=\"$page_first_link\">".__('First page')."</li></ul></li>
@@ -3054,7 +3057,9 @@
 						}
 
 					if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
-						print "<li class=\"top3\">
+						print "
+							<li class=\"vsep\">&nbsp;</li>
+							<li class=\"top3\">
 							<a href=\"javascript:labelFromSearch('$search', '$search_mode',
 								'$match_on', '$feed_id', '$is_cat');\">
 								".__('Convert to label')."</a></td>";

sanity_check.php

@@ -2,7 +2,7 @@
 	require_once "functions.php";
 
 	define('EXPECTED_CONFIG_VERSION', 7);
-	define('SCHEMA_VERSION', 17);
+	define('SCHEMA_VERSION', 18);
 
 	if (!file_exists("config.php")) {
 		print __("<b>Fatal Error</b>: You forgot to copy 

schema/ttrss_schema_mysql.sql

@@ -189,7 +189,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (17);
+insert into ttrss_version values (18);
 
 create table ttrss_prefs_types (id integer not null primary key, 
 	type_name varchar(100) not null) TYPE=InnoDB;
@@ -284,6 +284,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ENABLE_PAGINATION', 2, '', '', 1);
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),

schema/ttrss_schema_pgsql.sql

@@ -173,7 +173,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (17);
+insert into ttrss_version values (18);
 
 create table ttrss_prefs_types (id integer not null primary key, 
 	type_name varchar(100) not null);
@@ -264,6 +264,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ENABLE_PAGINATION', 2, '', '', 1);
+
 create table ttrss_user_prefs (
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
 	pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

schema/versions/mysql/18.sql

@@ -0,0 +1,3 @@
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ENABLE_PAGINATION', 2, '', '', 1);
+
+update ttrss_version set schema_version = 18;

schema/versions/pgsql/18.sql

@@ -0,0 +1,3 @@
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ENABLE_PAGINATION', 2, '', '', 1);
+
+update ttrss_version set schema_version = 18;