diff options
author | Jakob Sack <kde@jakobsack.de> | 2011-04-16 10:26:40 +0200 |
---|---|---|
committer | Jakob Sack <kde@jakobsack.de> | 2011-04-16 10:26:40 +0200 |
commit | e8f68480959031b9e97bc23efca9ac5cf566a009 (patch) | |
tree | edefc5671a114df8240486a6dae2d43535856b11 /lib/app.php | |
parent | 683677b4f9c5fcf3f7fed6db1881544898f816cc (diff) | |
parent | 69289bf9438f11df8d75fd034776983b997aa7b0 (diff) | |
download | nextcloud-server-e8f68480959031b9e97bc23efca9ac5cf566a009.tar.gz nextcloud-server-e8f68480959031b9e97bc23efca9ac5cf566a009.zip |
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
Diffstat (limited to 'lib/app.php')
-rw-r--r-- | lib/app.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/app.php b/lib/app.php index 1ced0469f98..9f1ce6f1047 100644 --- a/lib/app.php +++ b/lib/app.php @@ -54,7 +54,7 @@ class OC_APP{ // Our very own core apps are hardcoded foreach( array( "admin", "files", "log", "settings" ) as $app ){ - oc_require( "$app/appinfo/app.php" ); + require( "$app/appinfo/app.php" ); } // The rest comes here @@ -62,7 +62,7 @@ class OC_APP{ while( false !== ( $filename = readdir( $dir ))){ if( substr( $filename, 0, 1 ) != '.' ){ if( file_exists( "$SERVERROOT/apps/$filename/appinfo/app.php" )){ - oc_require( "apps/$filename/appinfo/app.php" ); + require( "apps/$filename/appinfo/app.php" ); } } } |