[Pkg-owncloud-commits] [owncloud] 75/172: Merge pull request #8556 from owncloud/kill-legacy-code-master

[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 408189b7e48ba3a738339ed3cb5fe6e376a8c94b
Merge: aea44ee f5ed92b
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon May 12 20:55:24 2014 +0200

    Merge pull request #8556 from owncloud/kill-legacy-code-master
    
    Kill legacy code master

 .../ajax/changeRecoveryPassword.php                |   2 +-
 apps/files_encryption/ajax/getMigrationStatus.php  |   2 +-
 apps/files_encryption/ajax/userrecovery.php        |   2 +-
 apps/files_encryption/appinfo/app.php              |   2 +-
 apps/files_encryption/hooks/hooks.php              |  20 +-
 apps/files_encryption/lib/helper.php               |   6 +-
 apps/files_encryption/lib/keymanager.php           |  44 +--
 apps/files_encryption/lib/proxy.php                |  16 +-
 apps/files_encryption/lib/session.php              |   2 +-
 apps/files_encryption/lib/stream.php               |   2 +-
 apps/files_encryption/lib/util.php                 |  10 +-
 apps/files_encryption/settings-personal.php        |   2 +-
 apps/files_encryption/tests/crypt.php              |   8 +-
 apps/files_encryption/tests/hooks.php              |   8 +-
 apps/files_encryption/tests/keymanager.php         |   6 +-
 apps/files_encryption/tests/proxy.php              |   6 +-
 apps/files_encryption/tests/share.php              |   8 +-
 apps/files_encryption/tests/stream.php             |   4 +-
 apps/files_encryption/tests/trashbin.php           |   4 +-
 apps/files_encryption/tests/util.php               |  12 +-
 apps/files_encryption/tests/webdav.php             |   4 +-
 apps/files_sharing/tests/base.php                  |   4 +-
 apps/files_sharing/tests/cache.php                 |   2 +-
 apps/files_trashbin/lib/trashbin.php               |   6 +-
 apps/files_versions/lib/versions.php               |   2 +-
 apps/user_ldap/lib/connection.php                  |   2 +-
 apps/user_ldap/lib/proxy.php                       |   2 +-
 core/avatar/controller.php                         |   8 +-
 lib/private/files/view.php                         |   2 +-
 lib/private/legacy/cache.php                       |  10 -
 lib/private/legacy/cache/fileglobalgc.php          |   4 -
 lib/private/legacy/filesystem.php                  | 415 ---------------------
 lib/private/legacy/filesystemview.php              |   9 -
 lib/private/route/router.php                       |   2 +-
 settings/ajax/decryptall.php                       |   2 +-
 settings/changepassword/controller.php             |   2 +-
 36 files changed, 102 insertions(+), 540 deletions(-)

diff --cc apps/user_ldap/lib/proxy.php
index 2d52107,1e10164..50e8071
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@@ -29,17 -29,11 +29,17 @@@ abstract class Proxy 
  	static private $accesses = array();
  	private $ldap = null;
  
 +	/**
 +	 * @param ILDAPWrapper $ldap
 +	 */
  	public function __construct(ILDAPWrapper $ldap) {
  		$this->ldap = $ldap;
- 		$this->cache = \OC_Cache::getGlobalCache();
+ 		$this->cache = \OC\Cache::getGlobalCache();
  	}
  
 +	/**
 +	 * @param $configPrefix
 +	 */
  	private function addAccess($configPrefix) {
  		$connector = new Connection($this->ldap, $configPrefix);
  		self::$accesses[$configPrefix] = new Access($connector, $this->ldap);

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