diff options
| author | Andrew Dolgov <[email protected]> | 2011-12-22 16:45:19 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-12-22 16:45:19 +0400 |
| commit | c4c74732db6b4ee63d970af29d1abfc692a17d7c (patch) | |
| tree | 8b02cfce7241096c270cf50a411973b5bd18041a | |
| parent | f0143d4ef9160e816e4b0320e6bd118a41fe587b (diff) | |
fix OPML import
| -rw-r--r-- | classes/dlg.php | 21 | ||||
| -rw-r--r-- | classes/pref_feeds.php | 2 | ||||
| -rw-r--r-- | include/login_form.php | 2 |
3 files changed, 7 insertions, 18 deletions
diff --git a/classes/dlg.php b/classes/dlg.php index b0cfe4451..a72683ef3 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -40,22 +40,11 @@ class Dlg extends Protected_Handler { /* Handle OPML import by DOMXML/DOMDocument */ - if (function_exists('domxml_open_file')) { - print "<ul class='nomarks'>"; - print "<li>".__("Importing using DOMXML.")."</li>"; - require_once "opml_domxml.php"; - opml_import_domxml($this->link, $owner_uid); - print "</ul>"; - } else if (PHP_VERSION >= 5) { - print "<ul class='nomarks'>"; - print "<li>".__("Importing using DOMDocument.")."</li>"; - require_once "opml_domdoc.php"; - opml_import_domdoc($this->link, $owner_uid); - print "</ul>"; - } else { - print_error(__("DOMXML extension is not found. It is required for PHP versions below 5.")); - } - + print "<ul class='nomarks'>"; + print "<li>".__("Importing using DOMDocument.")."</li>"; + require_once "opml.php"; + opml_import_domdoc($this->link, $owner_uid); + print "</ul>"; print "</div>"; print "<div align='center'>"; diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php index eebd25c69..5df5eb939 100644 --- a/classes/pref_feeds.php +++ b/classes/pref_feeds.php @@ -1419,7 +1419,7 @@ class Pref_Feeds extends Protected_Handler { action=\"backend.php\"> <input id=\"opml_file\" name=\"opml_file\" type=\"file\"> <input type=\"hidden\" name=\"op\" value=\"dlg\"> - <input type=\"hidden\" name=\"id\" value=\"importOpml\"> + <input type=\"hidden\" name=\"method\" value=\"importOpml\"> <button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\" type=\"submit\">" . __('Import') . "</button>"; diff --git a/include/login_form.php b/include/login_form.php index 04ca3e6d0..2650a46cc 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -8,7 +8,7 @@ <script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script> <script type="text/javascript" src="lib/prototype.js"></script> <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script> - <script type="text/javascript" src="functions.js"></script> + <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script> </head> |