[Pkg-owncloud-commits] [owncloud] 83/165: Merge pull request #15729 from owncloud/remove-unused-variables

[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 80b892e7ed7b2d6b5220840e1bb3b11115c72cb4
Merge: fd3c148 ccf47f4
Author: Robin McCorkell <rmccorkell at karoshi.org.uk>
Date:   Sun Apr 19 12:38:29 2015 +0100

    Merge pull request #15729 from owncloud/remove-unused-variables
    
    Remove unused variables

 lib/private/appframework/http/request.php | 3 +--
 lib/private/helper.php                    | 1 -
 lib/private/l10n.php                      | 3 ---
 lib/private/ocs/cloud.php                 | 2 +-
 lib/private/ocs/config.php                | 2 +-
 lib/private/ocs/person.php                | 2 +-
 lib/private/setup/mssql.php               | 4 +---
 lib/private/share/hooks.php               | 2 +-
 lib/private/subadmin.php                  | 8 ++++----
 lib/private/tags.php                      | 4 ++--
 lib/public/files.php                      | 2 +-
 lib/repair/repairlegacystorages.php       | 2 +-
 12 files changed, 14 insertions(+), 21 deletions(-)

diff --cc lib/private/tags.php
index 84ee5c9,dc57406..6edd7b2
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@@ -228,12 -228,12 +228,12 @@@ class Tags implements \OCP\ITags 
  				while ($row = $result->fetch()) {
  					$objId = (int)$row['objid'];
  					if (!isset($entries[$objId])) {
- 						$entry = $entries[$objId] = array();
+ 						$entries[$objId] = array();
  					}
- 					$entry = $entries[$objId][] = $row['category'];
+ 					$entries[$objId][] = $row['category'];
  				}
  				if (\OCP\DB::isError($result)) {
 -					\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
 +					\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
  					return false;
  				}
  			}

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