diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 5 | ||||
| -rw-r--r-- | classes/opml.php | 3 | ||||
| -rw-r--r-- | classes/pluginhost.php | 1 | ||||
| -rw-r--r-- | classes/rpc.php | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 4857cca78..5fa51768c 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -126,6 +126,11 @@ class Feeds extends Handler_Protected { "</option>"; } + if ($pluginhost->get_plugin("mailto")) { + $reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email'). + "</option>"; + } + $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>"; $reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>"; diff --git a/classes/opml.php b/classes/opml.php index b91e395d1..34067e017 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -462,7 +462,8 @@ class Opml extends Handler_Protected { # if ($debug) $doc = DOMDocument::load("/tmp/test.opml"); if (is_file($_FILES['opml_file']['tmp_name'])) { - $doc = DOMDocument::load($_FILES['opml_file']['tmp_name']); + $doc = new DOMDocument(); + $doc->load($_FILES['opml_file']['tmp_name']); } else if (!$doc) { print_error(__('Error: please upload OPML file.')); return; diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 592629881..79544b01b 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -21,6 +21,7 @@ class PluginHost { const HOOK_RENDER_ARTICLE = 10; const HOOK_RENDER_ARTICLE_CDM = 11; const HOOK_FEED_FETCHED = 12; + const HOOK_SANITIZE = 13; const KIND_ALL = 1; const KIND_SYSTEM = 2; diff --git a/classes/rpc.php b/classes/rpc.php index 5d77b1ae8..b297bbade 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -285,6 +285,7 @@ class RPC extends Handler_Protected { function sanityCheck() { $_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true"; + $_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true"; $reply = array(); |