Merge pull request #361 from tobiasd/20160728-piwik

Piwik addon, baseurl as variable name has problems with Friendica

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 7a1cb5813776a001100e333a31122f2db2f1f42b..279c82e2ab243b4650b6f43de91bc2e9de4f836b 100755 (executable)
--- 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 <https://f.diekershoff.de/profile/tobias>
  * 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 bfe04aa31ef7d58bd072786e49330f38ce236523..2ab1869b96ff6dab7e7cb4c8c7f8e37ced8b95e0 100644 (file)
--- 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}}