Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
b0d83d6d
Commit
b0d83d6d
authored
13 years ago
by
Arthur Schiwon
Browse files
Options
Downloads
Patches
Plain Diff
make it possible to load apps seperately. needed to fix oc-910 without breaking oc-863
parent
cf85a1e2
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/app.php
+12
-17
12 additions, 17 deletions
lib/app.php
with
12 additions
and
17 deletions
lib/app.php
+
12
−
17
View file @
b0d83d6d
...
@@ -35,6 +35,7 @@ class OC_App{
...
@@ -35,6 +35,7 @@ class OC_App{
static
private
$personalForms
=
array
();
static
private
$personalForms
=
array
();
static
private
$appInfo
=
array
();
static
private
$appInfo
=
array
();
static
private
$appTypes
=
array
();
static
private
$appTypes
=
array
();
static
private
$loadedApps
=
array
();
/**
/**
* @brief loads all apps
* @brief loads all apps
...
@@ -48,24 +49,18 @@ class OC_App{
...
@@ -48,24 +49,18 @@ class OC_App{
* if $types is set, only apps of those types will be loaded
* if $types is set, only apps of those types will be loaded
*/
*/
public
static
function
loadApps
(
$types
=
null
){
public
static
function
loadApps
(
$types
=
null
){
// Did we already load everything?
if
(
self
::
$init
){
return
true
;
}
// Load the enabled apps here
// Load the enabled apps here
$apps
=
self
::
getEnabledApps
();
$apps
=
self
::
getEnabledApps
();
// prevent app.php from printing output
// prevent app.php from printing output
ob_start
();
ob_start
();
foreach
(
$apps
as
$app
){
foreach
(
$apps
as
$app
){
if
((
is_null
(
$types
)
or
self
::
isType
(
$app
,
$types
))){
if
((
is_null
(
$types
)
or
self
::
isType
(
$app
,
$types
))
&&
!
in_array
(
$app
,
self
::
$loadedApps
)
){
self
::
loadApp
(
$app
);
self
::
loadApp
(
$app
);
self
::
$loadedApps
[]
=
$app
;
}
}
}
}
ob_end_clean
();
ob_end_clean
();
self
::
$init
=
true
;
// return
// return
return
true
;
return
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment