diff options
| -rw-r--r-- | apps/files_external/lib/config.php | 2 | ||||
| -rw-r--r-- | core/img/favicon.ico | bin | 0 -> 5686 bytes | |||
| -rw-r--r-- | core/shipped.json | 1 | ||||
| -rw-r--r-- | core/templates/layout.base.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | cron.php | 2 | ||||
| -rw-r--r-- | settings/personal.php | 8 | ||||
| -rw-r--r-- | themes/example/core/img/favicon.ico | bin | 0 -> 5686 bytes |
9 files changed, 15 insertions, 4 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 56a7e547ec6..6c900f0f224 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -269,7 +269,7 @@ class OC_Mount_Config { } } catch (Exception $exception) { \OCP\Util::logException('files_external', $exception); - throw $e; + throw $exception; } } return self::STATUS_ERROR; diff --git a/core/img/favicon.ico b/core/img/favicon.ico Binary files differnew file mode 100644 index 00000000000..96bee5656a9 --- /dev/null +++ b/core/img/favicon.ico diff --git a/core/shipped.json b/core/shipped.json index b6f08a8b96d..49a649f3c9e 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -8,6 +8,7 @@ "external", "files", "files_antivirus", + "files_drop", "files_external", "files_ldap_home", "files_locking", diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index b01820a05bb..937179f32cd 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -11,7 +11,7 @@ <meta name="referrer" content="never"> <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> <meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>"> + <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen"> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 56b762d3266..0506542a0cf 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -12,7 +12,7 @@ <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> <meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>"> <meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>"> + <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>"> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen"> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index fcdebc03c97..e784b2f4bcb 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -23,7 +23,7 @@ <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:'ownCloud'); ?>"> <meta name="mobile-web-app-capable" content="yes"> <meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>"> - <link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path($_['appid'], 'favicon.png')); ?>"> + <link rel="shortcut icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="screen"> @@ -132,7 +132,9 @@ try { $jobList = \OC::$server->getJobList(); $jobs = $jobList->getAll(); foreach ($jobs as $job) { + $logger->debug('Run job with ID ' . $job->getId(), ['app' => 'cron']); $job->execute($jobList, $logger); + $logger->debug('Finished job with ID ' . $job->getId(), ['app' => 'cron']); } // unlock the file diff --git a/settings/personal.php b/settings/personal.php index d6d016c6545..bf1e1ad8793 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -93,6 +93,14 @@ foreach($languageCodes as $lang) { } } +// if user language is not available but set somehow: show the actual code as name +if (!is_array($userLang)) { + $userLang = [ + 'code' => $userLang, + 'name' => $userLang, + ]; +} + ksort($commonlanguages); // sort now by displayed language not the iso-code diff --git a/themes/example/core/img/favicon.ico b/themes/example/core/img/favicon.ico Binary files differnew file mode 100644 index 00000000000..70b59ad7669 --- /dev/null +++ b/themes/example/core/img/favicon.ico |