diff options
| -rwxr-xr-x[-rw-r--r--] | includes/bit_setup_inc.php | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | item_chart.php | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | templates/html_head_inc.tpl | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php index a408412..865ec73 100644..100755 --- a/includes/bit_setup_inc.php +++ b/includes/bit_setup_inc.php @@ -1,5 +1,6 @@ <?php use Bitweaver\Stats\Statistics; +use Bitweaver\KernelTools; global $gBitSystem, $gBitUser ; @@ -93,7 +94,7 @@ if( $gBitSystem->isPackageActive( 'stats' )) { } } } else { -// $ret = tra( 'Unknown URL' ); +// $ret = KernelTools::tra 'Unknown URL' ); } return $ret; } diff --git a/item_chart.php b/item_chart.php index 454ccc9..030762d 100644..100755 --- a/item_chart.php +++ b/item_chart.php @@ -16,7 +16,9 @@ /** * required setup */ +use Bitweaver\KernelTools; require_once '../kernel/includes/setup_inc.php'; + include_once( STATS_PKG_PATH . "Statistics.php" ); include_once( UTIL_PKG_INCLUDE_PATH . "phplot.php" ); global $gBitSystem; @@ -35,8 +37,8 @@ $graph->SetPrintImage(0); $graph->SetPlotType( $chart_type ); $graph->SetXTickPos( 'none' ); //$graph->SetYScaleType( 'log' ); -$graph->SetTitle( tra( $data['title'] ) ); -$graph->SetXLabel( tra( 'Title' ) ); +$graph->SetTitle( KernelTools::tra $data['title'] ) ); +$graph->SetXLabel( KernelTools::tra 'Title' ) ); $i = 0; foreach( $data['data'] as $guid => $info ) { diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl index 5784999..948a89d 100644..100755 --- a/templates/html_head_inc.tpl +++ b/templates/html_head_inc.tpl @@ -16,7 +16,7 @@ <!-- Google tag (gtag.js) --> <script async src="https://www.googletagmanager.com/gtag/js?id={$gBitSystem->getConfig('google_adwordstag_id')}"></script> <script> - window.dataLayer = window.dataLayer || []; + window.dataLayer = window.dataLayer or []; function gtag(){ldelim}dataLayer.push(arguments);{rdelim} gtag('js', new Date()); gtag('config', '{$gBitSystem->getConfig('google_adwordstag_id')}') @@ -28,7 +28,7 @@ {if $gBitSystem->getConfig('google_analytics_ua')} <script async src="https://www.googletagmanager.com/gtag/js?id={$gBitSystem->getConfig('google_analytics_ua')}"></script> <script> - window.dataLayer = window.dataLayer || []; + window.dataLayer = window.dataLayer or []; function gtag(){ldelim}dataLayer.push(arguments);{rdelim} gtag('js', new Date()); gtag('config', '{$gBitSystem->getConfig('google_analytics_ua')}'); |