[Pkg-owncloud-commits] [owncloud] 115/165: Avoid function name collision in dropbox external storage

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit a637bd7f2b82bf52515a198071d74b776d492f28
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Apr 20 14:56:51 2015 +0200

    Avoid function name collision in dropbox external storage
---
 apps/files_external/lib/dropbox.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index b685f63..78219f8 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -77,7 +77,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 	 * @return mixed directory contents if $list is true, file metadata if $list is
 	 * false, null if the file doesn't exist or "false" if the operation failed
 	 */
-	private function getMetaData($path, $list = false) {
+	private function getDropBoxMetaData($path, $list = false) {
 		$path = $this->root.$path;
 		if ( ! $list && isset($this->metaData[$path])) {
 			return $this->metaData[$path];
@@ -150,7 +150,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 	}
 
 	public function opendir($path) {
-		$contents = $this->getMetaData($path, true);
+		$contents = $this->getDropBoxMetaData($path, true);
 		if ($contents !== false) {
 			$files = array();
 			foreach ($contents as $file) {
@@ -163,7 +163,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 	}
 
 	public function stat($path) {
-		$metaData = $this->getMetaData($path);
+		$metaData = $this->getDropBoxMetaData($path);
 		if ($metaData) {
 			$stat['size'] = $metaData['bytes'];
 			$stat['atime'] = time();
@@ -177,7 +177,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 		if ($path == '' || $path == '/') {
 			return 'dir';
 		} else {
-			$metaData = $this->getMetaData($path);
+			$metaData = $this->getDropBoxMetaData($path);
 			if ($metaData) {
 				if ($metaData['is_dir'] == 'true') {
 					return 'dir';
@@ -193,7 +193,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 		if ($path == '' || $path == '/') {
 			return true;
 		}
-		if ($this->getMetaData($path)) {
+		if ($this->getDropBoxMetaData($path)) {
 			return true;
 		}
 		return false;
@@ -213,7 +213,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 	public function rename($path1, $path2) {
 		try {
 			// overwrite if target file exists and is not a directory
-			$destMetaData = $this->getMetaData($path2);
+			$destMetaData = $this->getDropBoxMetaData($path2);
 			if (isset($destMetaData) && $destMetaData !== false && !$destMetaData['is_dir']) {
 				$this->unlink($path2);
 			}
@@ -297,7 +297,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 		if ($this->filetype($path) == 'dir') {
 			return 'httpd/unix-directory';
 		} else {
-			$metaData = $this->getMetaData($path);
+			$metaData = $this->getDropBoxMetaData($path);
 			if ($metaData) {
 				return $metaData['mime_type'];
 			}

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