From: fraccy <fraccy>
Date: Thu, 30 Jun 2005 16:16:21 +0000 (+0000)
Subject: fix for voodoopad url writer
X-Git-Tag: 0.9~360
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5b2bd9e578027c250b0ee20f502f7730ea96c711;p=s9y.git

fix for voodoopad url writer
---

diff --git a/include/admin/importers/voodoopad.inc.php b/include/admin/importers/voodoopad.inc.php
index 8a682cd..f52c970 100644
--- a/include/admin/importers/voodoopad.inc.php
+++ b/include/admin/importers/voodoopad.inc.php
@@ -129,7 +129,7 @@ class Serendipity_Import_VoodooPad extends Serendipity_Import {
                     // Pluck out the existing one if its there
                     $page = serendipity_db_query("SELECT * 
                                                     FROM {$serendipity['dbPrefix']}staticpages 
-                                                    WHERE filename = '" . serendipity_db_escape_string($mykey) . "'
+                                                    WHERE filename = '" . serendipity_db_escape_string($mykey.'.htm') . "'
                                                     LIMIT 1", true, 'assoc');
                     if (is_array($page)) {
                         $thispage =& $page;
@@ -138,14 +138,14 @@ class Serendipity_Import_VoodooPad extends Serendipity_Import {
                         }
                     }
     
-                    $thispage['filename']  = $mykey;
+                    $thispage['filename']  = $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';
+		    $thispage['permalink'] = $serendipity['serendipityHTTPPath'] . 'index.php?serendipity[subpage]=' . $mykey;
                     break;
 
                 case 'alias': // The title and the string used to match links
                     $thispage['articleformattitle'] = $this->data['wikiName'];
-                    $thispage['pagetitle'] = $elements[$key_a]->data;
+                    $thispage['pagetitle'] = $mykey;
                     $thispage['headline'] = $elements[$key_a]->data;
                     break;