fix categories array in categories theme

3 years ago · b3fd39a712
2 changed files with 22 additions and 11 deletions
--- a/templates/themes/categories/frames.html
+++ b/templates/themes/categories/frames.html
@ -65,7 +65,7 @@
 	<title>{{ settings.title }}</title>
 </head>
 <body>
-	{{ include(settings.file_sidebar) }}
-	{{ include(settings.file_news) }}
+	{% include 'themes/categories/' ~ settings.file_sidebar %}
+	{% include 'themes/categories/' ~ settings.file_news %}
 </body>
 </html>
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@ -29,7 +29,14 @@
 		public static function homepage($settings) {
 			global $config;

-			return Element('themes/categories/frames.html', Array('config' => $config, 'settings' => $settings));
+            return Element(
+                'themes/categories/frames.html',
+                Array(
+                    'config' => $config,
+                    'settings' => $settings,
+                    'categories' => Categories::getCategories($config)
+                )
+            );
 		}
 		
 		// Build news page
@ -51,6 +58,14 @@
 		public static function sidebar($settings) {
 			global $config, $board;
 			
+			return Element('themes/categories/sidebar.html', Array(
+				'settings' => $settings,
+				'config' => $config,
+				'categories' => Categories::getCategories($config)
+			));
+		}
+
+        private static function getCategories($config) {
 			$categories = $config['categories'];
 			
 			foreach ($categories as &$boards) {
@ -62,11 +77,7 @@
 				}
 			}

-			return Element('themes/categories/sidebar.html', Array(
-				'settings' => $settings,
-				'config' => $config,
-				'categories' => $categories
-			));
+            return $categories;
        }
 	};