This commit is contained in:
@@ -141,6 +141,10 @@ class ActivityServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -116,6 +116,10 @@ class ActivityLogServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -127,6 +127,10 @@ class AuthServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -126,6 +126,10 @@ class DashboardServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -113,6 +113,10 @@ class ExternalSystemServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -117,6 +117,10 @@ class FeedbackServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -143,6 +143,10 @@ class MembershipApplicationServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -111,6 +111,10 @@ class NotificationServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -117,6 +117,10 @@ class RoleServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
@@ -179,6 +179,10 @@ class UserServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
protected function merge_config_from(string $path, string $key): void
|
protected function merge_config_from(string $path, string $key): void
|
||||||
{
|
{
|
||||||
|
if ($this->app->configurationIsCached()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$existing = config($key, []);
|
$existing = config($key, []);
|
||||||
$module_config = require $path;
|
$module_config = require $path;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user