mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20809 from owncloud/dont-trust-update-server-message 

Don't trust update server
This commit is contained in:
Thomas Müller 2015-11-30 11:20:30 +01:00
parent 9c1dbaf0ad f3e9106864
commit a94819f4a4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/layout.user.php
View File

@ -4,7 +4,7 @@
<!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]--> <!--[if (gt IE 9)|!(IE)]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>" <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"
<?php if ($_['updateAvailable']): ?> <?php if ($_['updateAvailable']): ?>
data-update-version="<?php print($_['updateVersion']); ?>" data-update-link="<?php print_unescaped($_['updateLink']); ?>" data-update-version="<?php p($_['updateVersion']); ?>" data-update-link="<?php p($_['updateLink']); ?>"
<?php endif; ?> <?php endif; ?>
> >
<meta charset="utf-8"> <meta charset="utf-8">

2
lib/private/templatelayout.php
View File

@ -85,7 +85,9 @@ class OC_TemplateLayout extends OC_Template {
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) { if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
$this->assign('updateAvailable', true); $this->assign('updateAvailable', true);
$this->assign('updateVersion', $data['versionstring']); $this->assign('updateVersion', $data['versionstring']);
if(substr($data['web'], 0, 8) === 'https://') {
$this->assign('updateLink', $data['web']); $this->assign('updateLink', $data['web']);
}
\OCP\Util::addScript('core', 'update-notification'); \OCP\Util::addScript('core', 'update-notification');
} else { } else {
$this->assign('updateAvailable', false); // No update available or not an admin user $this->assign('updateAvailable', false); // No update available or not an admin user