diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/importoldchangelog/action.php | 11 | ||||
| -rw-r--r-- | lib/plugins/plugin/admin.php | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/plugins/importoldchangelog/action.php b/lib/plugins/importoldchangelog/action.php index e927b3e26..37f3eb87d 100644 --- a/lib/plugins/importoldchangelog/action.php +++ b/lib/plugins/importoldchangelog/action.php @@ -38,8 +38,14 @@ class action_plugin_importoldchangelog extends DokuWiki_Action_Plugin { $oldline = @explode("\t", $line); if ($oldline!==false && count($oldline)>1) { // trim summary - $wasMinor = (substr($oldline[4], 0, 1)==='*'); - $sum = rtrim(substr($oldline[4], 1), "\n"); + $tmp = substr($oldline[4], 0, 1); + $wasMinor = ($tmp==='*'); + if ($tmp==='*' || $tmp===' ') { + $sum = rtrim(substr($oldline[4], 1), "\n"); + } else { + // no is_minor prefix in summary + $sum = rtrim($oldline[4], "\n"); + } // guess line type $type = 'E'; if ($wasMinor) { $type = 'e'; } @@ -171,6 +177,7 @@ function importoldchangelog_plugin_shutdown() { // import successful touch($path['import_ok']); @unlink($path['failed']); + plugin_disable('importoldchangelog'); // only needs to run once } } diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index 643754771..0062d7370 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -23,7 +23,7 @@ require_once(DOKU_PLUGIN.'admin.php'); // plugins that are an integral part of dokuwiki, they shouldn't be disabled or deleted global $plugin_protected; - $plugin_protected = array('acl','plugin','config','info','usermanager', 'importoldchangelog'); + $plugin_protected = array('acl','plugin','config','info','usermanager'); /** * All DokuWiki plugins to extend the admin function |