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

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-01 00:29:09 +02:00
commit 0f27a9e4d4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/adherents/stats/geo.php
View File

@ -51,8 +51,9 @@ $langs->load("members");
* View
*/
llxHeader('','','','',0,0,array('http://www.google.com/jsapi'));
$arrayjs=array('http://www.google.com/jsapi');
if (! empty($conf->dol_use_jmobile)) $arrayjs=array();
llxHeader('','','','',0,0,$arrayjs);
$title=$langs->trans("Statistics");
if ($mode == 'memberbycountry') $title=$langs->trans("MembersStatisticsByCountries");
@ -196,7 +197,7 @@ else
// Show graphics
if ($mode == 'memberbycountry')
if (count($arrayjs) && $mode == 'memberbycountry')
{
$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
if (is_readable($color_file)) include_once $color_file;