Merge branch 'master' into digest-experimental

master
Andrew Dolgov 14 years ago
commit 9de31493dd

@ -32,13 +32,13 @@
if (function_exists('domxml_open_file')) { if (function_exists('domxml_open_file')) {
print "<ul class='nomarks'>"; print "<ul class='nomarks'>";
print "<li>".__("Importing using DOMXML.")."</li>"; print "<li>".__("Importing using DOMXML.")."</li>";
require_once "modules/opml_domxml.php"; require_once "opml_domxml.php";
opml_import_domxml($link, $owner_uid); opml_import_domxml($link, $owner_uid);
print "</ul>"; print "</ul>";
} else if (PHP_VERSION >= 5) { } else if (PHP_VERSION >= 5) {
print "<ul class='nomarks'>"; print "<ul class='nomarks'>";
print "<li>".__("Importing using DOMDocument.")."</li>"; print "<li>".__("Importing using DOMDocument.")."</li>";
require_once "modules/opml_domdoc.php"; require_once "opml_domdoc.php";
opml_import_domdoc($link, $owner_uid); opml_import_domdoc($link, $owner_uid);
print "</ul>"; print "</ul>";
} else { } else {

Loading…
Cancel
Save