work with the new SEARCH_QUERY_PAGELOOKUP event result

splitbrain · Jun 26, 2010 · d75e50b · d75e50b
1 parent 39ecab8
commit d75e50b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/action.php b/action.php
@@ -77,19 +77,41 @@ function translation_hook(&$event, $args) {
      * default language first
      */
     function translation_search(&$event, $args) {
-        // sort into translation slots
-        $res = array();
-        foreach($event->result as $r){
-            $tr = $this->hlp->getLangPart($r);
-            if(!is_array($res["x$tr"])) $res["x$tr"] = array();
-            $res["x$tr"][] = $r;
-        }
-        // sort by translations
-        ksort($res);
-        // combine
-        $event->result = array();
-        foreach($res as $r){
-            $event->result = array_merge($event->result,$r);
+
+        if($event->data['has_titles']){
+            // sort into translation slots
+            $res = array();
+            foreach($event->result as $r => $t){
+                $tr = $this->hlp->getLangPart($r);
+                if(!is_array($res["x$tr"])) $res["x$tr"] = array();
+                $res["x$tr"][] = array($r,$t);
+            }
+            // sort by translations
+            ksort($res);
+            // combine
+            $event->result = array();
+            foreach($res as $r){
+                foreach($r as $l){
+                    $event->result[$l[0]] = $l[1];
+                }
+            }
+        }else{
+            # legacy support for old DokuWiki hooks
+
+            // sort into translation slots
+            $res = array();
+            foreach($event->result as $r){
+                $tr = $this->hlp->getLangPart($r);
+                if(!is_array($res["x$tr"])) $res["x$tr"] = array();
+                $res["x$tr"][] = $r;
+            }
+            // sort by translations
+            ksort($res);
+            // combine
+            $event->result = array();
+            foreach($res as $r){
+                $event->result = array_merge($event->result,$r);
+            }
         }
     }
 

diff --git a/plugin.info.txt b/plugin.info.txt
@@ -2,7 +2,7 @@
 base   translation
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2009-10-25
+date   2010-06-26
 name   Translation Plugin
 desc   Supports the easy setup of a multi-language wiki.
 url    http://www.dokuwiki.org/plugin:translation