[Pkg-owncloud-commits] [owncloud] 24/46: Encapsulate require_once to avoid name space bleedind

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 9998861402d9b16e2e7d8ebd9382633fc91a5dae
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Oct 17 12:28:27 2014 +0200

    Encapsulate require_once to avoid name space bleedind
    
    The script required by require_once might use variable names like $app
    which will conflict with the code that follows.
    
    This fix encapsulates require_once into its own function to avoid such
    issues.
---
 lib/private/app.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index d58c851..20c0f5f 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -92,7 +92,7 @@ class OC_App {
 			if ($checkUpgrade and self::shouldUpgrade($app)) {
 				throw new \OC\NeedsUpdateException();
 			}
-			require_once $app . '/appinfo/app.php';
+			self::requireAppFile($app);
 			if (self::isType($app, array('authentication'))) {
 				// since authentication apps affect the "is app enabled for group" check,
 				// the enabled apps cache needs to be cleared to make sure that the
@@ -104,6 +104,16 @@ class OC_App {
 	}
 
 	/**
+	 * Load app.php from the given app
+	 *
+	 * @param string $app app name
+	 */
+	private static function requireAppFile($app) {
+		// encapsulated here to avoid variable scope conflicts
+		require_once $app . '/appinfo/app.php';
+	}
+
+	/**
 	 * check if an app is of a specific type
 	 *
 	 * @param string $app

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git