diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-09-18 09:11:48 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-09-18 09:11:48 +0400 |
| commit | b260c8b5a0d02ca5bea43ad7004933286ac14322 (patch) | |
| tree | e48ed722e2e98d5bc371a902f3cb8223f1d1760a | |
| parent | 19e201afd35b541a96d8666ed463703abc3446df (diff) | |
Fixing encoding error
| -rw-r--r-- | plugins/SitesManager/API.php | 2 | ||||
| -rw-r--r-- | plugins/SitesManager/javascripts/SitesManager.js | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 875189b77b..9231b3855a 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -198,7 +198,7 @@ class API public function getAllSites() { Piwik::checkUserIsSuperUser(); - $sites = \Zend_Registry::get('db')->fetchAll("SELECT * FROM " . Common::prefixTable("site")); + $sites = \Zend_Registry::get('db')->fetchAll("SELECT * FROM " . Common::prefixTable("site") . " ORDER BY idsite ASC"); $return = array(); foreach ($sites as $site) { $return[$site['idsite']] = $site; diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js index b6046ee6d9..040ac7e8f0 100644 --- a/plugins/SitesManager/javascripts/SitesManager.js +++ b/plugins/SitesManager/javascripts/SitesManager.js @@ -335,21 +335,26 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc if (searchGlobalHasValues) { var checkedStr = checked ? ' checked ' : ''; - html += '<label><span id="sitesearchUseDefault"' + (!enabled ? ' style="display:none" ' : '') + '><input type="checkbox" ' + html += '<span id="sitesearchUseDefault"' + (!enabled ? ' style="display:none" ' : '') + '><input type="checkbox" ' + checkedStr + ' id="sitesearchUseDefaultCheck" onclick="return onClickSiteSearchUseDefault();"> ' + sitesearchUseDefault + ' </span>'; + '</label>'; html += '<div ' + ((checked && enabled) ? '' : 'style="display-none"') + ' class="searchDisplayParams form-description">' + searchKeywordLabel + ' (' + strDefault + ') ' + ': ' - + globalKeywordParameters - + (globalCategoryParameters.length ? ', ' + searchCategoryLabel + ': ' + globalCategoryParameters : '') + + piwikHelper.htmlEntities( globalKeywordParameters ) + + (globalCategoryParameters.length ? ', ' + searchCategoryLabel + ': ' + piwikHelper.htmlEntities(globalCategoryParameters) : '') + '</div>'; } html += '<div id="sitesearchIntro">' + sitesearchIntro + '</div>'; html += '<div id="searchSiteParameters">'; - html += '<br/><label><div style="margin-bottom:3px">' + searchKeywordLabel + '</div><input type="text" size="22" id="searchKeywordParameters" value="' + searchKeywordParameters + '" style="margin-bottom: -10px;font-size:9pt;font-family:monospace"></input>' + searchKeywordHelp + '</label>'; + html += '<br/><label><div style="margin-bottom:3px">' + + piwikHelper.htmlEntities(searchKeywordLabel) + + '</div><input type="text" size="22" id="searchKeywordParameters" value="' + + piwikHelper.htmlEntities(searchKeywordParameters) + + '" style="margin-bottom: -10px;font-size:9pt;font-family:monospace"></input>' + + searchKeywordHelp + '</label>'; // if custom var plugin is disabled, category tracking not supported if (globalCategoryParameters != 'globalSearchCategoryParametersIsDisabled') { |