Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gnu-social
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
194
Issues
194
List
Boards
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gnu.io
gnu-social
Commits
03987419
Commit
03987419
authored
Oct 19, 2013
by
mmn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Core plugin list would not merge into $config
parent
565e32ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
lib/siteprofile.php
lib/siteprofile.php
+8
-2
lib/statusnet.php
lib/statusnet.php
+3
-3
No files found.
lib/siteprofile.php
View file @
03987419
...
...
@@ -78,9 +78,11 @@ abstract class SiteProfileSettings
throw
new
MethodNotImplementedException
(
__METHOD__
);
}
static
function
corePlugins
()
{
return
common_config
(
'plugins'
,
'core'
);
}
static
function
defaultPlugins
()
{
return
array_merge
(
common_config
(
'plugins'
,
'core'
),
common_config
(
'plugins'
,
'default'
));
return
common_config
(
'plugins'
,
'default'
);
}
}
...
...
@@ -106,6 +108,7 @@ class PublicSite extends SiteProfileSettings
)
),
'plugins'
=>
array
(
'core'
=>
self
::
corePlugins
(),
'default'
=>
array_merge
(
self
::
defaultPlugins
(),
array
(
'Directory'
=>
null
,
'ExtendedProfile'
=>
null
,
...
...
@@ -142,6 +145,7 @@ class PrivateSite extends SiteProfileSettings
)
),
'plugins'
=>
array
(
'core'
=>
self
::
corePlugins
(),
'default'
=>
array_merge
(
self
::
defaultPlugins
(),
array
(
'Directory'
=>
null
,
'ExtendedProfile'
=>
null
,
...
...
@@ -194,6 +198,7 @@ class CommunitySite extends SiteProfileSettings
)
),
'plugins'
=>
array
(
'core'
=>
self
::
corePlugins
(),
'default'
=>
array_merge
(
self
::
defaultPlugins
(),
array
(
'Directory'
=>
null
,
'Geonames'
=>
null
,
...
...
@@ -229,6 +234,7 @@ class SingleuserSite extends SiteProfileSettings
)
),
'plugins'
=>
array
(
'core'
=>
self
::
corePlugins
(),
'default'
=>
array_merge
(
self
::
defaultPlugins
(),
array
(
'Geonames'
=>
null
,
'NewMenu'
=>
null
,
...
...
lib/statusnet.php
View file @
03987419
...
...
@@ -110,12 +110,12 @@ class StatusNet
{
Router
::
clear
();
StatusNet
::
initDefaults
(
$server
,
$path
);
StatusNet
::
loadConfigFile
(
$conffile
);
self
::
initDefaults
(
$server
,
$path
);
self
::
loadConfigFile
(
$conffile
);
$sprofile
=
common_config
(
'site'
,
'profile'
);
if
(
!
empty
(
$sprofile
))
{
StatusNet
::
loadSiteProfile
(
$sprofile
);
self
::
loadSiteProfile
(
$sprofile
);
}
// Load settings from database; note we need autoload for this
Config
::
loadSettings
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment