hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Permalink.php
This commit is contained in:
Romain Neutron
2013-10-25 18:50:15 +02:00
parent 74fd7988bb 35e9e692d2
commit 212b09afa2
6 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/Browser.php
View File

@@ -737,6 +737,16 @@ class Browser
}
return true;
} else if(stripos($this->_agent, 'trident') !== false) {
// >= IE 11
$this->setBrowser(self::BROWSER_IE);
// version
$result = explode("rv:", $this->_agent);
$this->setVersion(preg_replace("/[^0-9.]+/", "", $result[1]));
// remove Gecko out of the user-agent, otherwise the mozilla check will success
$this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
}
return false;

2
lib/classes/appbox.php
View File

@@ -397,7 +397,7 @@ class appbox extends base
if (version_compare($from_version, '3.7') < 0) {
$upgrader->addRecommendation(_('Your install might need to re-read technical datas'), 'bin/console records:rescan-technical-datas');
$upgrader->addRecommendation(_('Your install might need to re-read technical datas'), 'bin/console records:build-missing-subdefs');
$upgrader->addRecommendation(_('Your install might need to build some sub-definitions'), 'bin/console records:build-missing-subdefs');
}
return $advices;