Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-06-20 15:05:19 +02:00
parent 46d22c53ea 64facf06d0
commit 1007dac3cb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -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.", "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", "homepage": "http://www.board3.de",
"version": "2.1.0", "version": "2.1.0",
"time": "2015-05-07 14:47:44", "time": "2015-06-20 13:27:52",
"license": "GPL-2.0", "license": "GPL-2.0",
"authors": [{ "authors": [{
"name": "Marc Alexander", "name": "Marc Alexander",
@@ -28,7 +28,7 @@
"extra": { "extra": {
"display-name": "Board3 Portal", "display-name": "Board3 Portal",
"soft-require": { "soft-require": {
"phpbb/phpbb": ">=3.1.4,<3.2.*@dev" "phpbb/phpbb": ">=3.1.5,<3.2.*@dev"
}, },
"version-check": { "version-check": {
"host": "board3.de", "host": "board3.de",

2
composer.lock generated
View File

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

2
controller/helper.php
View File

@@ -108,7 +108,7 @@ class helper
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
$this->portal_helper = $portal_helper; $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/');
} }
/** /**