Update for namespaces

i-net-software · Feb 1, 2021 · 39abe1c · 39abe1c
1 parent 72ec21f
commit 39abe1c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/action/aggregate.php b/action/aggregate.php
@@ -22,8 +22,9 @@ public function register(Doku_Event_Handler $controller) {
         $controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'siteexport_aggregate_button', array ());
     }
 
-    private function prefixStart($entry) {
-        return noNS($namespace) == $conf['start'] ? $namespace : $namespace . ':' . $conf['start'];
+    private function prefixStart($namespace) {
+        global $conf;
+        return getNS($namespace) . ':' . $conf['start'];
     }
 
     public function siteexport_aggregate(Doku_Event &$event)
@@ -62,10 +63,10 @@ public function siteexport_aggregate(Doku_Event &$event)
                     $values = $functions->__getOrderedListOfPagesForStartEnd($lookupNS, $INPUT->int( 'mergecompare_start' ), $INPUT->int( 'mergecompare_end', PHP_INT_MAX ) );
             } else {
                 $values = $functions->__getOrderedListOfPagesForID($lookupNS, $exportBase);
-                $values = array(end( $values )); // the list above has the $exportBase element at the very end
             }
         }
 
+
         $includeSelected = $INPUT->str('includeSelectedVersion', 'true', true ) === 'true';
         if( !$includeSelected && count( $values ) > 1 ) {
             array_pop( $values ); // Remove last entry which is the selected version, but only if more than one entry exists