From: fraccy <fraccy>
Date: Thu, 30 Jun 2005 07:46:31 +0000 (+0000)
Subject: Fixed permalink style in voodoopad importer
X-Git-Tag: 0.9~364
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7db31941b5f1ad0f96ab81ef591b913dd26990a2;p=s9y.git

Fixed permalink style in voodoopad importer
---

diff --git a/include/admin/importers/voodoopad.inc.php b/include/admin/importers/voodoopad.inc.php
index a131801..8a682cd 100644
--- a/include/admin/importers/voodoopad.inc.php
+++ b/include/admin/importers/voodoopad.inc.php
@@ -139,9 +139,8 @@ class Serendipity_Import_VoodooPad extends Serendipity_Import {
                     }
     
                     $thispage['filename']  = $mykey;
-                    // FIXME: Use real permalink specified for that file; users without mod_rewrite or not using this will get errors.
-                    // Suggestion: use index.php?serendipity[subpage]=XXX, it works on all systems.
-                    $thispage['permalink'] = $serendipity['serendipityHTTPPath'] . 'pages/' . $mykey .'.htm';
+                    // Thanks for pointing this out to me and not just fixing it, I'm learning.
+		    $thispage['permalink'] = $serendipity['serendipityHTTPPath'] . 'index.php?serendipity[subpage]=' . $mykey .'.htm';
                     break;
 
                 case 'alias': // The title and the string used to match links
@@ -265,4 +264,4 @@ function character_data_handler($parser, $data){
 }
 
 return 'Serendipity_Import_VoodooPad';
-?>
\ No newline at end of file
+?>