bring back (debloated) version of unexpanded combined mode

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index 424f87e9461e8db7872232db1208f33158276c3c..f6d09fe6714e7ee27384926ca2a500e79395aac0 100755 (executable)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1164,8 +1164,8 @@
                                "feed_debug_viewfeed" => __("Debug viewfeed()"),
                                "catchup_all" => __("Mark all feeds as read"),
                                "cat_toggle_collapse" => __("Un/collapse current category"),
-                               "toggle_combined_mode" => __("Toggle combined mode"),
-                               "toggle_cdm_expanded" => __("Toggle auto expand in combined mode")),
+                               "toggle_cdm_expanded" => __("Toggle auto expand in combined mode"),
+                               "toggle_combined_mode" => __("Toggle combined mode")),
                        __("Go to") => array(
                                "goto_all" => __("All articles"),
                                "goto_fresh" => __("Fresh"),
@@ -1251,10 +1251,8 @@
                        "^(191)|Ctrl+/" => "help_dialog",
                );
 
-               if (get_pref('COMBINED_DISPLAY_MODE')) {
-                       $hotkeys["^(38)|Ctrl-up"] = "prev_article_noscroll";
-                       $hotkeys["^(40)|Ctrl-down"] = "next_article_noscroll";
-               }
+               $hotkeys["^(38)|Ctrl-up"] = "prev_article_noscroll";
+               $hotkeys["^(40)|Ctrl-down"] = "next_article_noscroll";
 
                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HOTKEY_MAP) as $plugin) {
                        $hotkeys = $plugin->hook_hotkey_map($hotkeys);
@@ -1764,6 +1762,10 @@
                                                array_push($attrs_to_remove, $attr);
                                        }
 
+                                       if (strpos($attr->nodeName, "data-") === 0) {
+                                               array_push($attrs_to_remove, $attr);
+                                       }
+
                                        if ($attr->nodeName == 'href' && stripos($attr->value, 'javascript:') === 0) {
                                                array_push($attrs_to_remove, $attr);
                                        }
@@ -2093,7 +2095,7 @@
                $sth = $pdo->prepare("SELECT access_key FROM ttrss_access_keys
                                WHERE feed_id = ? AND is_cat = ?
                                AND owner_uid = ?");
-               $sth->execute([$feed_id, (int)$is_cat, $owner_uid]);
+               $sth->execute([$feed_id, $is_cat, $owner_uid]);
 
                if ($row = $sth->fetch()) {
                        return $row["access_key"];
@@ -2104,7 +2106,7 @@
                                        (access_key, feed_id, is_cat, owner_uid)
                                        VALUES (?, ?, ?, ?)");
 
-                       $sth->execute([$key, $feed_id, (int)$is_cat, $owner_uid]);
+                       $sth->execute([$key, $feed_id, $is_cat, $owner_uid]);
 
                        return $key;
                }