X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=CodeDoc.php;h=7164b35fc7f4373e11d18a5ff5fb356e4969c3f6;hb=9aac3018f29a320eb055de023e26227ac932415c;hp=1bd72f351d516d6e48efa526fb5f469f9c9b6f88;hpb=54fc9e474ac1742467129e17a7bf555ad8444fab;p=PHP_CodeDoc

diff --git a/CodeDoc.php b/CodeDoc.php
index 1bd72f3..7164b35 100644
--- a/CodeDoc.php
+++ b/CodeDoc.php
@@ -395,7 +395,7 @@ class PHP_CodeDoc {
                 continue;
             }
             foreach($ar[$cls->name] as $cat=>$catdata) {
-                $catdata[$cat] = isset($catdata[$cat]) ? array_merge($catdata[$cat], $catdata) : $catdata;
+                $cats[$cat] = isset($cats[$cat]) ? array_merge($cats[$cat], $catdata) : $catdata;
             }
             unset($ar[$cls->name]);
             print_R($cats);
@@ -417,7 +417,7 @@ class PHP_CodeDoc {
             
             
         }
-        $file = self::$options['targetJS'].'/categories.bjs';
+        $file = self::$options['targetJS'].'/categories.json';
         file_put_contents($file, json_encode($cats ,JSON_PRETTY_PRINT));