Merge branch '2.1.x'

composer.json

@@ -4,7 +4,7 @@
 	"description": "Adds a portal with several blocks to your forum. You can change the settings, move the blocks, add new blocks and more in the ACP.",
 	"homepage": "http://www.board3.de",
 	"version": "2.1.0",
-	"time": "2015-05-07 14:47:44",
+	"time": "2015-06-20 13:27:52",
 	"license": "GPL-2.0",
 	"authors": [{
 			"name": "Marc Alexander",
@@ -28,7 +28,7 @@
 	"extra": {
 		"display-name": "Board3 Portal",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.4,<3.2.*@dev"
+			"phpbb/phpbb": ">=3.1.5,<3.2.*@dev"
 		},
 		"version-check": {
 			"host": "board3.de",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c994b2b8ddc0cceee41f2d5c294b6677",
+    "hash": "16fa7b983ba4704c2b4fb11611f8c1d7",
     "packages": [
         {
             "name": "nickvergessen/phpbb-tool-trimmessage",

controller/helper.php

@@ -108,7 +108,7 @@ class helper
 		$this->php_ext = $php_ext;
 		$this->portal_helper = $portal_helper;
 
-		$this->root_path = $phpbb_root_path . 'ext/board3/portal/';
+		$this->root_path = str_replace($this->path_helper->get_web_root_path(), '', $phpbb_root_path . 'ext/board3/portal/');
 	}
 
 	/**