diff options
-rw-r--r-- | functions.php | 6 | ||||
-rw-r--r-- | modules/popup-dialog.php | 5 | ||||
-rw-r--r-- | modules/pref-feeds.php | 33 | ||||
-rw-r--r-- | modules/pref-filters.php | 6 |
4 files changed, 25 insertions, 25 deletions
diff --git a/functions.php b/functions.php index 471f1fe7f..ec0f484ad 100644 --- 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 a806e0c70..b55799ba3 100644 --- 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 0329a1298..591597337 100644 --- 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 50120a2e7..5c71fcb03 100644 --- 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"]); |