Merge branch 'master' into imgsrc-path

tetsuo13 · Aug 10, 2012 · d9a8217 · d9a8217
2 parents ebe9ad0 + 10ccbaa
commit d9a8217
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/convertSyntax.php b/src/convertSyntax.php
@@ -256,10 +256,10 @@ private function convertList($record) {
      */
     private function convertHeadings($record) {
         $patterns = array('/^======(.+)======\s*$/m' => '==\1==',
-                          '/^=====(.+)=====\s*$/m'   => '===\1===',
-                          '/^====(.+)====\s*$/m'     => '====\1====',
-                          '/^===(.+)===\s*$/m'       => '=====\1=====',
-                          '/^==(.+)==\s*$/m'         => '======\1======');
+                          '/^=====(.+)=====\s*$/m'   => '==\1==',
+                          '/^====(.+)====\s*$/m'     => '===\1===',
+                          '/^===(.+)===\s*$/m'       => '====\1====',
+                          '/^==(.+)==\s*$/m'         => '=====\1=====');
 
         // Insert a unique string to the replacement so that it won't be
         // caught in a search later.
@@ -277,7 +277,6 @@ private function convertHeadings($record) {
         }
 
         // Strip out the unique strings.
-        return preg_replace('/^' . $this->placeholder . '(={2,6})/', '\1',
-                            $convertedRecord);
+        return str_replace($this->placeholder, '', $convertedRecord);
     }
 }
diff --git a/src/mediawiki2dokuwiki.php b/src/mediawiki2dokuwiki.php
@@ -143,11 +143,9 @@ function convert(PDO $db, array $mwikiDb, array $lang) {
  * @param array $lang   DokuWiki language
  */
 function processPage(array $record, array $lang) {
-    $converter = '====== ' . $record['page_title'] . ' ======'
-               . new mediaWikiConverter($record['old_text']);
+    $converter = new mediaWikiConverter($record['old_text']);
 
-    saveWikiText($record['page_title'], con('', $converter->convert(), ''),
-                 $lang['created']);
+    saveWikiText($record['page_title'], con('', "====== " . $record['page_title'] . " ======\n\n" . $converter->convert(), ''), $lang['created']);
 }
 
 /**