Merge branch 'master' of https://github.com/piwik/piwik

plugins/LanguagesManager/Controller.php

@@ -23,6 +23,7 @@ class Piwik_LanguagesManager_Controller extends Piwik_Controller
 	public function saveLanguage()
 	{
 		$language = Piwik_Common::getRequestVar('language');
+		$this->checkTokenInUrl();
 		Piwik_LanguagesManager::setLanguageForSession($language);
 		if(Zend_Registry::isRegistered('access')) {
 			$currentUser = Piwik::getCurrentUserLogin();
@@ -32,5 +33,5 @@ class Piwik_LanguagesManager_Controller extends Piwik_Controller
 			}
 		}
 		Piwik_Url::redirectToReferer();
-	}	
+	}
 }

plugins/LanguagesManager/templates/languages.tpl

@@ -7,6 +7,7 @@
 			<option value="{$language.code}" {if $language.code == $currentLanguageCode}selected="selected"{/if} title="{$language.name} ({$language.english_name})">{$language.name}</option>
 			{/foreach}
 		</select>
+		<input type="hidden" name="token_auth" value="{$token_auth}"/>
 		<input type="submit" value="go" />
 		</form>
 	</span>