Bug fix, plugin language dictionary

bludit · Jun 6, 2016 · 159199a · 159199a
1 parent 2aed08b
commit 159199a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/bl-kernel/dblanguage.class.php b/bl-kernel/dblanguage.class.php
@@ -71,7 +71,7 @@ public function p($string)
 
 	public function add($array)
 	{
-		$this->db = array_merge($this->db, $array);
+		$this->db = array_merge($array, $this->db);
 	}
 
 	// Returns the item from plugin-data.

diff --git a/bl-plugins/api/plugin.php b/bl-plugins/api/plugin.php
@@ -117,6 +117,21 @@ private function getPage($key)
 		return $Page->json();
 	}
 
+	private function getAllPages()
+	{
+		$pages = buildAllPages();
+
+		$tmp = array();
+
+		foreach($pages as $Page) {
+			if($Page->published()) {
+				array_push($tmp, $Page->json( $returnsArray=true ));
+			}
+		}
+
+		return json_encode($tmp);
+	}
+
 	public function beforeRulesLoad()
 	{
 		global $Url;
@@ -171,8 +186,8 @@ public function beforeRulesLoad()
 					if($parameters[2] === 'posts') {
 						$json = $this->getAllPosts();
 					}
-					elseif($parameters[1] === 'pages') {
-						$json = $this->getAllPosts();
+					elseif($parameters[2] === 'pages') {
+						$json = $this->getAllPages();
 					}
 				}
 			}