[Pkg-owncloud-commits] [SCM] owncloud.git branch, debian-wheezy, updated. debian/4.0.4debian2-2-3-g789f5f9

[Thomas Mueller]

The following commit has been merged in the debian-wheezy branch:
commit 789f5f9bc6b5bc7676e20de7f1fd8b26ef221bce
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sat Sep 22 18:19:55 2012 +0200

    another backported security bug fix

diff --git a/debian/patches/backported_security_fixes.diff b/debian/patches/backported_security_fixes.diff
index 7b157b3..8626963 100644
--- a/debian/patches/backported_security_fixes.diff
+++ b/debian/patches/backported_security_fixes.diff
@@ -59,4 +59,14 @@
  		}
  	}
  	
-
+--- owncloud-4.0.4debian2.orig/lib/l10n.php
++++ owncloud-4.0.4debian2/lib/l10n.php
+@@ -92,7 +92,7 @@ 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::$APPSROOT."/apps") || 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');
+ 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){

-- 
owncloud.git