Merge branch 'master' into digest-experimental

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