From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 08:22:33 +0000 (+0200)
Subject: Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
X-Git-Tag: v4.0.5~44
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4235ce0b63aa1084d48cddc567366e7d22a4f2d3;p=nextcloud-server.git

Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
---

4235ce0b63aa1084d48cddc567366e7d22a4f2d3
diff --cc lib/l10n.php
index c5967109a60,868f8881ec2..de8514573d3
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@@ -113,9 -92,9 +113,9 @@@ class OC_L10N
  			$i18ndir = self::findI18nDir($app);
  			// Localization is in /l10n, Texts are in $i18ndir
  			// (Just no need to define date/time format etc. twice)
 -			if(file_exists($i18ndir.$lang.'.php')){
 +			if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
  				// Include the file, save the data from $CONFIG
- 				include($i18ndir.$lang.'.php');
+ 				include(strip_tags($i18ndir).strip_tags($lang).'.php');
  				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
  					$this->translations = $TRANSLATIONS;
  				}