disable headlines pagination (add hidden pref _PREFS_ENABLE_PAGINATION)

diff --git a/functions.php b/functions.php
index 9f7f39d247f488029ae2c3c387c90ad2e4b027fb..4257184c126df9ca37c0c270e73b8a3cc253da57 100644 (file)
--- a/functions.php
+++ b/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>";

diff --git a/sanity_check.php b/sanity_check.php
index adb7ab878711fcd8513603ad526aed0e4da7f286..81d9693648652c752f359b7ddb4f09d62c3ecef6 100644 (file)
--- a/sanity_check.php
+++ b/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 

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 355dab790dced4520329521d6c80a2fc8f6f0776..86261d6f4563b4b163121d746e3368fb958c2cc5 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/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),

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index b18212725b377b5193ac0c846e753fe45c3b8510..65a528c3af283f392d51b35d10fc137a24f899f8 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/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,

diff --git a/schema/versions/mysql/18.sql b/schema/versions/mysql/18.sql
new file mode 100644 (file)
index 0000000..e03c96f
--- /dev/null
+++ b/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;

diff --git a/schema/versions/pgsql/18.sql b/schema/versions/pgsql/18.sql
new file mode 100644 (file)
index 0000000..e03c96f
--- /dev/null
+++ b/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;