lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed regression

Browse Source
This commit is contained in:
Marcos García de La Fuente 2015-02-25 16:41:51 +01:00
parent 7e07638fba
commit f598963d6b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@ -135,13 +135,15 @@ function getBrowserInfo($user_agent)
$name='unknown';
$version='';
$os='unknown';
$phone = 'unknown';
$phone = '';
$detectmobile = new MobileDetect(null, $user_agent);
$tablet = $detectmobile->isTablet();
if ($detectmobile->isMobile()) {
$phone = 'unknown';
// If phone/smartphone, we set phone os name.
if ($detectmobile->is('AndroidOS')) {
$os = $phone = 'android';

14
test/phpunit/FunctionsLibTest.php
View File

@ -131,7 +131,7 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('ie',$tmp['browsername']);
$this->assertEquals('5.0',$tmp['browserversion']);
$this->assertFalse($tmp['phone']);
$this->assertEmpty($tmp['phone']);
$this->assertFalse($tmp['tablet']);
$this->assertEquals('classic', $tmp['layout']);
@ -140,7 +140,7 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('firefox',$tmp['browsername']);
$this->assertEquals('0.9.1',$tmp['browserversion']);
$this->assertFalse($tmp['phone']);
$this->assertEmpty($tmp['phone']);
$this->assertFalse($tmp['tablet']);
$this->assertEquals('classic', $tmp['layout']);
@ -148,7 +148,7 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('opera',$tmp['browsername']);
$this->assertEquals('6.03',$tmp['browserversion']);
$this->assertFalse($tmp['phone']);
$this->assertEmpty($tmp['phone']);
$this->assertFalse($tmp['tablet']);
$this->assertEquals('classic', $tmp['layout']);
@ -156,7 +156,7 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('chrome',$tmp['browsername']);
$this->assertEquals('19.0.1042.0',$tmp['browserversion']);
$this->assertFalse($tmp['phone']);
$this->assertEmpty($tmp['phone']);
$this->assertFalse($tmp['tablet']);
$this->assertEquals('classic', $tmp['layout']);
@ -164,7 +164,7 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('chrome',$tmp['browsername']);
$this->assertEquals('17.0.963.56',$tmp['browserversion']);
$this->assertFalse($tmp['phone']);
$this->assertEmpty($tmp['phone']);
$this->assertFalse($tmp['tablet']);
$this->assertEquals('classic', $tmp['layout']);
@ -172,7 +172,7 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('safari',$tmp['browsername']);
$this->assertEquals('533.21.1',$tmp['browserversion']);
$this->assertFalse($tmp['phone']);
$this->assertEmpty($tmp['phone']);
$this->assertFalse($tmp['tablet']);
$this->assertEquals('classic', $tmp['layout']);
@ -181,7 +181,7 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('ie',$tmp['browsername']);
$this->assertEquals('11.0',$tmp['browserversion']);
$this->assertFalse($tmp['phone']);
$this->assertEmpty($tmp['phone']);
$this->assertFalse($tmp['tablet']);
$this->assertEquals('classic', $tmp['layout']);