Merge branch 'master' into patch-1

bl-kernel/admin/controllers/logout.php

@@ -21,5 +21,5 @@
 // ============================================================================
 
 if ($login->logout()) {
-	Redirect::home();
+	Redirect::admin();
 }

bl-kernel/boot/init.php

@@ -179,7 +179,7 @@ define('HTML_PATH_UPLOADS_THUMBNAILS',	HTML_PATH_UPLOADS.'thumbnails/');
 define('HTML_PATH_PLUGINS',		HTML_PATH_ROOT.'bl-plugins/');
 
 // --- Objects with dependency ---
-$language = $language = new Language( $site->language() );
+$language = new Language( $site->language() );
 $url->checkFilters( $site->uriFilters() );
 
 // --- CONSTANTS with dependency ---

bl-kernel/boot/variables.php

@@ -96,7 +96,7 @@ define('SESSION_COOKIE_LIFE_TIME', 0);
 $GLOBALS['ALERT_DISSAPEAR_IN'] = 3; // Seconds
 
 // Number of images to show in the media manager per page
-$GLOBALS['MEDIA_MANAGER_NUMBER_OF_FILES'] = 2;
+$GLOBALS['MEDIA_MANAGER_NUMBER_OF_FILES'] = 5;
 
 // Sort the image by date
 $GLOBALS['MEDIA_MANAGER_SORT_BY_DATE'] = true;

bl-kernel/helpers/redirect.class.php

@@ -22,4 +22,8 @@ class Redirect {
 		self::url(HTML_PATH_ROOT);
 	}
 
+	public static function admin()
+	{
+		self::url(HTML_PATH_ADMIN_ROOT);
+	}
 }

bl-kernel/pagex.class.php

@@ -73,10 +73,7 @@ class Page {
 			return $content;
 		}
 
-		$contentRaw = $this->contentRaw();
-
-		// Parse pre code with htmlentities
-		$content = Text::pre2htmlentities($contentRaw);
+		$content = $this->contentRaw();
 
 		// Parse Markdown
 		$parsedown = new Parsedown();

bl-languages/ar_MA.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/bg_BG.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/cs_CZ.json

@@ -364,5 +364,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/de_CH.json

@@ -364,5 +364,6 @@
     "hello": "Hallo",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/de_DE.json

@@ -364,5 +364,6 @@
     "hello": "Hallo",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/en.json

@@ -364,5 +364,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/es.json

@@ -363,5 +363,6 @@
     "hello": "Hola",
     "there-are-no-images-for-the-page": "No hay imágenes para la página.",
     "select-cover-image": "Seleccionar imagen de portada",
-    "this-plugin-depends-on-the-following-plugins": "Este plugin depende de los siguientes plugins."
+    "this-plugin-depends-on-the-following-plugins": "Este plugin depende de los siguientes plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/fa_IR.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/fi_FI.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/fr_FR.json

@@ -364,5 +364,6 @@
     "hello": "Salut",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/gr.json

@@ -364,5 +364,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/he_IL.json

@@ -364,5 +364,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/hu_HU.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/it_IT.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/ja_JP.json

@@ -364,5 +364,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/ms_MY.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/nl_NL.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/pl_PL.json

@@ -364,5 +364,6 @@
     "hello": "Cześć",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/pt_BR.json

@@ -364,5 +364,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/pt_PT.json

@@ -364,5 +364,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/ro_RO.json

@@ -360,5 +360,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/ru_RU.json

@@ -364,5 +364,6 @@
     "hello": "Привет",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
-}
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
+}

bl-languages/tr_TR.json

@@ -365,5 +365,6 @@
     "hello": "Merhaba",
     "there-are-no-images-for-the-page": "Sayfa için resim yok.",
     "select-cover-image": "Kapak resmini seç",
-    "this-plugin-depends-on-the-following-plugins": "Bu eklenti aşağıdaki eklentilere bağlıdır."
-}
+    "this-plugin-depends-on-the-following-plugins": "Bu eklenti aşağıdaki eklentilere bağlıdır.",
+    "no-pages-found": "No pages found"
+}

bl-languages/uk_UA.json

@@ -364,5 +364,6 @@
     "hello": "Вітаю",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/vi_VN.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/zh_CN.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-languages/zh_TW.json

@@ -363,5 +363,6 @@
     "hello": "Hello",
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
-    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins."
+    "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
+    "no-pages-found": "No pages found"
 }

bl-plugins/search/plugin.php

@@ -35,7 +35,7 @@ class pluginSearch extends Plugin {
 	public function siteSidebar()
 	{
 		global $L;
-		
+
 		$html  = '<div class="plugin plugin-search">';
 		$html .= '<h2 class="plugin-label">'.$this->getValue('label').'</h2>';
 		$html .= '<div class="plugin-content">';
@@ -124,6 +124,8 @@ class pluginSearch extends Plugin {
 		if ($this->webhook($webhook, false, false)) {
 
 			global $url;
+			global $WHERE_AM_I;
+			$WHERE_AM_I = 'search';
 
 			// Get the pre-defined variable from the rule 69.pages.php
 			// We change the content to show in the website