diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 068475783c..9dc3cdd714 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -231,7 +231,7 @@ class OC_Mount_Config { $file = OC::$SERVERROOT.'/config/mount.php'; } if (is_file($file)) { - $mountPoints = include($file); + $mountPoints = include $file; if (is_array($mountPoints)) { return $mountPoints; } diff --git a/lib/filesystem.php b/lib/filesystem.php index 00682573dd..09ccf9de4d 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -210,7 +210,7 @@ class OC_Filesystem{ static private function loadSystemMountPoints($user) { if(is_file(OC::$SERVERROOT.'/config/mount.php')) { - $mountConfig=include(OC::$SERVERROOT.'/config/mount.php'); + $mountConfig=include OC::$SERVERROOT.'/config/mount.php'; if(isset($mountConfig['global'])) { foreach($mountConfig['global'] as $mountPoint=>$options) { self::mount($options['class'],$options['options'],$mountPoint); diff --git a/lib/helper.php b/lib/helper.php index a52adc9695..37a17885ee 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -350,8 +350,8 @@ class OC_Helper { if(strpos($path,'.')) { //try to guess the type by the file extension - if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')) { - self::$mimetypes=include('mimetypes.list.php'); + if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') { + self::$mimetypes=include 'mimetypes.list.php'; } $extension=strtolower(strrchr(basename($path), ".")); $extension=substr($extension,1);//remove leading . diff --git a/lib/installer.php b/lib/installer.php index 9135c60fc0..56e474bb3b 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -187,7 +187,7 @@ class OC_Installer{ //run appinfo/install.php if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')) { - include($basedir.'/appinfo/install.php'); + include $basedir.'/appinfo/install.php'; } //set the installed version @@ -320,7 +320,7 @@ class OC_Installer{ //run appinfo/install.php if(is_file(OC_App::getAppPath($app)."/appinfo/install.php")) { - include(OC_App::getAppPath($app)."/appinfo/install.php"); + include OC_App::getAppPath($app)."/appinfo/install.php"; } $info=OC_App::getAppInfo($app); OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app)); diff --git a/lib/l10n.php b/lib/l10n.php index 6667747b88..41c89a7d4b 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -120,7 +120,7 @@ class OC_L10N{ OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) { // Include the file, save the data from $CONFIG - include(strip_tags($i18ndir).strip_tags($lang).'.php'); + include strip_tags($i18ndir).strip_tags($lang).'.php'; if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) { $this->translations = $TRANSLATIONS; } @@ -128,7 +128,7 @@ class OC_L10N{ if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) { // Include the file, save the data from $CONFIG - include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php'); + include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php'; if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) { $this->localizations = array_merge($this->localizations, $LOCALIZATIONS); } diff --git a/lib/migrate.php b/lib/migrate.php index 611a935ee5..3694ea877a 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -66,7 +66,7 @@ class OC_Migrate{ foreach($apps as $app) { $path = OC_App::getAppPath($app) . '/appinfo/migrate.php'; if( file_exists( $path ) ) { - include( $path ); + include $path; } } } diff --git a/lib/template.php b/lib/template.php index 1c529932a3..972d75807c 100644 --- a/lib/template.php +++ b/lib/template.php @@ -405,7 +405,7 @@ class OC_Template{ // Execute the template ob_start(); - include( $this->template ); // <-- we have to use include because we pass $_! + include $this->template; // <-- we have to use include because we pass $_! $data = ob_get_contents(); @ob_end_clean(); @@ -430,7 +430,7 @@ class OC_Template{ // Include ob_start(); - include( $this->path.$file.'.php' ); + include $this->path.$file.'.php'; $data = ob_get_contents(); @ob_end_clean(); diff --git a/lib/util.php b/lib/util.php index c5f41be324..0a824f86eb 100755 --- a/lib/util.php +++ b/lib/util.php @@ -68,7 +68,7 @@ class OC_Util { $user_root = OC_User::getHome($user); $userdirectory = $user_root . '/files'; if (is_file($user_root.'/mount.php')) { - $mountConfig = include($user_root.'/mount.php'); + $mountConfig = include $user_root.'/mount.php'; if (isset($mountConfig['user'][$user])) { foreach ($mountConfig['user'][$user] as $mountPoint => $options) { OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);