From 12777e0a8798b126bc4a886dedfb39b3f3c3cbaf Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 28 Jul 2016 16:32:05 +0200 Subject: [PATCH] Piwik addon, baseurl as variable name has problems with Friendica --- piwik/piwik.php | 4 ++-- piwik/templates/admin.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/piwik/piwik.php b/piwik/piwik.php index 7a1cb581..279c82e2 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -2,7 +2,7 @@ /** * Name: Piwik Analytics * Description: Piwik Analytics Plugin for Friendica - * Version: 1.2 + * Version: 1.3 * Author: Tobias Diekershoff * Author: Klaus Weidenbach */ @@ -87,7 +87,7 @@ function piwik_plugin_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/piwik/" ); $o = replace_macros( $t, array( '$submit' => t('Save Settings'), - '$baseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')), + '$piwikbaseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')), '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''), '$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''), '$async' => array('async', t('Asynchronous tracking'), get_config('piwik','async' ), ''), diff --git a/piwik/templates/admin.tpl b/piwik/templates/admin.tpl index bfe04aa3..2ab1869b 100644 --- a/piwik/templates/admin.tpl +++ b/piwik/templates/admin.tpl @@ -1,4 +1,4 @@ -{{include file="field_input.tpl" field=$baseurl}} +{{include file="field_input.tpl" field=$piwikbaseurl}} {{include file="field_input.tpl" field=$siteid}} {{include file="field_checkbox.tpl" field=$optout}} {{include file="field_checkbox.tpl" field=$async}}