Revert "theme_image: do not display themed image if noone is logged in"

bad patch

This reverts commit 0b9751cd650c917d3e7f5dc5493483f8b026bf21.

diff --git a/functions.php b/functions.php
index 471f1fe7f70e9c789c9617d6b8b0ab143fbeac45..ec0f484ad4c8b5e6d644e01e8c80793d00776f8e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2047,7 +2047,7 @@
 
        function get_user_theme($link) {
 
-               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
+               if (get_schema_version($link) >= 63) {
                        $theme_name = get_pref($link, "_THEME_ID");
                        if (is_dir("themes/$theme_name")) {
                                return $theme_name;
@@ -2062,7 +2062,7 @@
 
        function get_user_theme_path($link) {
 
-               if (get_schema_version($link) >= 63 && $_SESSION["uid"]) {
+               if (get_schema_version($link) >= 63) {
                        $theme_name = get_pref($link, "_THEME_ID");
 
                        if ($theme_name && is_dir("themes/$theme_name")) {
@@ -3751,7 +3751,7 @@
                        $res = preg_replace('/<img[^>]+>/is', '', $res);
                }
 
-               if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
+               if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW', $owner)) {
                        $res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
                }
 

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index a806e0c70242692b37e7c2fb58c6239068b2a1ec..b55799ba32bc7ebd55a3ab52cbc0dd250b1f9f37 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -575,9 +575,8 @@
 
                        print "<div align='center'>";
 
-                       print "<input class=\"button\"
-                               type=\"submit\" onclick=\"return closeInfoBox()\" 
-                               value=\"".__('Close')."\">";
+                       print "<button onclick=\"return closeInfoBox()\">".
+                               __('Close this window')."</button>";
 
                        print "</div>";
 

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 0329a129893fd8127ab8f3474bd809c2cbe2bec8..59159733798c4924b2da5057ae9c582c6d03be48 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1192,26 +1192,23 @@
                print "<button onclick=\"javascript:removeSelectedFeeds()\">"
                        .__('Unsubscribe')."</button> ";
 
-/*             print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
-                       <option value=\"facDefault\" selected>".__('Other actions...')."</option>";
+               if (defined('_ENABLE_FEED_DEBUGGING')) {
 
-               if (FORCE_ARTICLE_PURGE == 0) {
-                       print 
-                               "<option value=\"facPurge\">".__('Manual purge')."</option>";
-               }
-
-               print "
-                       <option value=\"facClear\">".__('Clear feed data')."</option>
-                       <option value=\"facRescore\">".__('Rescore articles')."</option>
-                       <option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>";
-
-               print "</select>"; */
+                       print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
+                               <option value=\"facDefault\" selected>".__('More actions...')."</option>";
+       
+                       if (FORCE_ARTICLE_PURGE == 0) {
+                               print 
+                                       "<option value=\"facPurge\">".__('Manual purge')."</option>";
+                       }
+       
+                       print "
+                               <option value=\"facClear\">".__('Clear feed data')."</option>
+                               <option value=\"facRescore\">".__('Rescore articles')."</option>";
+       
+                       print "</select>";
 
-/*             if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
-                       print " <input type=\"submit\" class=\"button\"
-                               id=\"top25_feeds_btn\"
-                               onclick=\"javascript:browseFeeds()\" value=\"".__('More feeds')."\">";
-               } */
+               }
 
                $feeds_sort = db_escape_string($_REQUEST["sort"]);
 

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 50120a2e710c442f590f00595a0b67c1b5c1817f..5c71fcb03f8d6b90e2742b4e32a5dc444b308a88 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -215,6 +215,8 @@
                }
 
                if ($subop == "remove") {
+                       
+                       if ($memcache) $memcache->flush();
 
                        $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
@@ -224,7 +226,9 @@
                }
 
                if ($subop == "add") {
-               
+
+                       if ($memcache) $memcache->flush();
+
                        $regexp = db_escape_string(trim($_REQUEST["reg_exp"]));
                        $filter_type = db_escape_string(trim($_REQUEST["filter_type"]));
                        $feed_id = db_escape_string($_REQUEST["feed_id"]);