mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 07:24:27 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into psr-7

Browse Source 
Conflicts:
	src/Api/Actions/Discussions/IndexAction.php
	src/Api/Actions/SerializeAction.php
	src/Core/Formatter/FormatterManager.php
	src/Extend/ForumAssets.php
	src/Forum/Actions/IndexAction.php
	src/Forum/ForumServiceProvider.php
This commit is contained in:
Franz Liedke
2015-06-17 00:52:50 +02:00
parent ffb28838b5 d1e7453ffd
commit 1cbc60ca41
91 changed files with 1381 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Support/Extensions/ExtensionsServiceProvider.php
View File

@@ -21,11 +21,12 @@ class ExtensionsServiceProvider extends ServiceProvider
$providers = [];
foreach ($extensions as $extension) {
if (file_exists($file = base_path().'/extensions/'.$extension.'/bootstrap.php')) {
if (file_exists($file = public_path().'/extensions/'.$extension.'/bootstrap.php') ||
file_exists($file = base_path().'/extensions/'.$extension.'/bootstrap.php')) {
$providers[$extension] = require $file;
}
}
// @todo store $providers somewhere so that extensions can talk to each other
// @todo store $providers somewhere (in Core?) so that extensions can talk to each other
}
}