diff options
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 2 | ||||
| -rw-r--r-- | apps/files/list.php | 2 | ||||
| -rw-r--r-- | apps/files/recentlist.php | 2 | ||||
| -rw-r--r-- | apps/files/simplelist.php | 2 | ||||
| -rw-r--r-- | apps/files_external/list.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/list.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/list.php | 2 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 2 | ||||
| -rw-r--r-- | lib/public/Util.php | 10 |
9 files changed, 8 insertions, 18 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index aade5a5b44a..e430e41b54e 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -306,7 +306,7 @@ class ViewController extends Controller { $params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name'); $params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc'); $params['showgridview'] = $this->config->getUserValue($user, 'files', 'show_grid', false); - $params['isIE'] = \OCP\Util::isIE(); + $params['isIE'] = \OC_Util::isIe(); $showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false); $params['showHiddenFiles'] = $showHidden ? 1 : 0; $cropImagePreviews = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'crop_image_previews', true); diff --git a/apps/files/list.php b/apps/files/list.php index 872f711344a..52d736516c9 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -28,7 +28,7 @@ $userSession = \OC::$server->getUserSession(); $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes'); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); -$isIE = \OCP\Util::isIE(); +$isIE = OC_Util::isIe(); // renders the controls and table headers template $tmpl = new OCP\Template('files', 'list', ''); diff --git a/apps/files/recentlist.php b/apps/files/recentlist.php index fdd02679319..55ca3d48449 100644 --- a/apps/files/recentlist.php +++ b/apps/files/recentlist.php @@ -28,7 +28,7 @@ $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); -$isIE = \OCP\Util::isIE(); +$isIE = OC_Util::isIe(); $tmpl = new OCP\Template('files', 'recentlist', ''); diff --git a/apps/files/simplelist.php b/apps/files/simplelist.php index 404be951e26..25bef1968c1 100644 --- a/apps/files/simplelist.php +++ b/apps/files/simplelist.php @@ -27,7 +27,7 @@ $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); -$isIE = \OCP\Util::isIE(); +$isIE = OC_Util::isIe(); // renders the controls and table headers template $tmpl = new OCP\Template('files', 'simplelist', ''); diff --git a/apps/files_external/list.php b/apps/files_external/list.php index 6e6aa39cda7..d628f593577 100644 --- a/apps/files_external/list.php +++ b/apps/files_external/list.php @@ -28,7 +28,7 @@ $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true); -$isIE = \OCP\Util::isIE(); +$isIE = OC_Util::isIe(); $tmpl = new OCP\Template('files_external', 'list', ''); diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 3a9bd028cbc..ab40444022d 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -36,7 +36,7 @@ $legacyEventDispatcher = \OC::$server->getEventDispatcher(); $eventDispatcher = \OC::$server->get(OCP\EventDispatcher\IEventDispatcher::class); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); -$isIE = \OCP\Util::isIE(); +$isIE = OC_Util::isIe(); $tmpl = new OCP\Template('files_sharing', 'list', ''); diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php index 239e24f7a62..2dbc03719ec 100644 --- a/apps/files_trashbin/list.php +++ b/apps/files_trashbin/list.php @@ -30,7 +30,7 @@ $config = \OC::$server->getConfig(); $userSession = \OC::$server->getUserSession(); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', false); -$isIE = \OCP\Util::isIE(); +$isIE = OC_Util::isIe(); $tmpl = new OCP\Template('files_trashbin', 'index', ''); diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index f8f6536cee5..17627f81369 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -80,7 +80,7 @@ class TemplateLayout extends \OC_Template { /** @var IInitialStateService */ $this->initialState = \OC::$server->get(IInitialStateService::class); - if (Util::isIE()) { + if (\OC_Util::isIe()) { Util::addStyle('ie'); } diff --git a/lib/public/Util.php b/lib/public/Util.php index 7cecb6bf86b..3281c9cceec 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -521,14 +521,4 @@ class Util { } return self::$needUpgradeCache; } - - /** - * is this Internet explorer ? - * - * @return boolean - * @since 14.0.0 - */ - public static function isIe() { - return \OC_Util::isIe(); - } } |