summaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-01-04 21:39:49 +0100
committerRobin Appelman <icewind1991@gmail.com>2011-01-04 21:39:49 +0100
commitca791d32d83da3abab5071e2b4719be34227a1e5 (patch)
tree6f99bd5e2401a7df29be68d19ccaa01a8f41df6e /inc
parent0f5923a15030c42156eddf05b161f92024c055ed (diff)
parent5c856e5741350e1130fc3026c59ab78109dd5b6a (diff)
downloadnextcloud-server-ca791d32d83da3abab5071e2b4719be34227a1e5.tar.gz
nextcloud-server-ca791d32d83da3abab5071e2b4719be34227a1e5.zip
Merge commit 'refs/merge-requests/41' of git://gitorious.org/owncloud/owncloud into integration
Diffstat (limited to 'inc')
-rw-r--r--inc/lib_plugin.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/inc/lib_plugin.php b/inc/lib_plugin.php
index 76f94a1156d..eb7533c4479 100644
--- a/inc/lib_plugin.php
+++ b/inc/lib_plugin.php
@@ -59,8 +59,10 @@ class OC_PLUGIN{
}
}
- foreach($data['runtime'] as $include){
- include($SERVERROOT.'/plugins/'.$id.'/'.$include);
+ if(isset($data['runtime'])){
+ foreach($data['runtime'] as $include){
+ include($SERVERROOT.'/plugins/'.$id.'/'.$include);
+ }
}
}
return false;