diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2011-01-03 08:49:45 +0300 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2011-01-03 08:49:45 +0300 |
| commit | 956c25213d771f37f7ed51bd56b0788be05e6603 (patch) | |
| tree | 83533901bd264f738f77350755112e9b304efe6e /core/SmartyPlugins | |
| parent | 97d410fd5c78155ea744a1b0fe6aae074e5f72bb (diff) | |
Various code cleanups and small improvements:
* Live! widget shows IP for all users except anonymous
* Widgetize displays full URL to the widget + preview link below widget
* Live! visitors text change from "Today" to "Last 24 hours" in preview
* remove data_push feature introduced in r1330 + removing campaign redirect feature since they are not used
* all errors should now display the Piwik header when applicable (or if a php error, prefixed with a sentence suggesting to submit error in piwik forums)
* fixing bug with cookie update when a visitor manually converts the same goal in the same second
* fixing XML output not valid in Chrome (HTML entities not valid, must use XML entities)
* simplifying + refactoring the truncation code in datatables.js (move from JS to small smarty template - hopefully we can fix this truncation and make it nice soon)
* removing unnecessary line breaks from translations
* refactoring duplicate code in renderers
git-svn-id: http://dev.piwik.org/svn/trunk@3565 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/SmartyPlugins')
| -rw-r--r-- | core/SmartyPlugins/function.url.php | 2 | ||||
| -rw-r--r-- | core/SmartyPlugins/modifier.escape.php | 2 | ||||
| -rw-r--r-- | core/SmartyPlugins/modifier.urlRewriteBasicView.php | 2 | ||||
| -rw-r--r-- | core/SmartyPlugins/modifier.urlRewriteWithParameters.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/SmartyPlugins/function.url.php b/core/SmartyPlugins/function.url.php index a30c2debc5..ce4f1947c0 100644 --- a/core/SmartyPlugins/function.url.php +++ b/core/SmartyPlugins/function.url.php @@ -26,5 +26,5 @@ */ function smarty_function_url($params, &$smarty) { - return htmlspecialchars('index.php' . Piwik_Url::getCurrentQueryStringWithParametersModified( $params )); + return Piwik_Common::sanitizeInputValue('index.php' . Piwik_Url::getCurrentQueryStringWithParametersModified( $params )); } diff --git a/core/SmartyPlugins/modifier.escape.php b/core/SmartyPlugins/modifier.escape.php index 31e6998453..4662476202 100644 --- a/core/SmartyPlugins/modifier.escape.php +++ b/core/SmartyPlugins/modifier.escape.php @@ -23,7 +23,7 @@ * @param html|htmlall|url|quotes|hex|hexentity|javascript * @return string */ -function smarty_modifier_escape($string, $esc_type = 'html', $char_set = 'ISO-8859-1') +function smarty_modifier_escape($string, $esc_type = 'html', $char_set = 'UTF-8') { switch ($esc_type) { case 'html': diff --git a/core/SmartyPlugins/modifier.urlRewriteBasicView.php b/core/SmartyPlugins/modifier.urlRewriteBasicView.php index 9ec68fdafe..17c948f499 100644 --- a/core/SmartyPlugins/modifier.urlRewriteBasicView.php +++ b/core/SmartyPlugins/modifier.urlRewriteBasicView.php @@ -36,5 +36,5 @@ function smarty_modifier_urlRewriteBasicView($parameters) // add module=CoreHome&action=showInContext $url = $url . '&module=CoreHome&action=showInContext'; - return htmlspecialchars($url); + return Piwik_Common::sanitizeInputValue($url); } diff --git a/core/SmartyPlugins/modifier.urlRewriteWithParameters.php b/core/SmartyPlugins/modifier.urlRewriteWithParameters.php index 6cec46aa5d..e6fc201bc6 100644 --- a/core/SmartyPlugins/modifier.urlRewriteWithParameters.php +++ b/core/SmartyPlugins/modifier.urlRewriteWithParameters.php @@ -20,5 +20,5 @@ function smarty_modifier_urlRewriteWithParameters($parameters) { $parameters['updated'] = null; $url = Piwik_Url::getCurrentQueryStringWithParametersModified($parameters); - return htmlspecialchars($url); + return Piwik_Common::sanitizeInputValue($url); } |