[Pkg-owncloud-commits] [owncloud] 42/153: Better variable names for table arrays.

[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 94522586c1717a55a2cc0f052f32ed9389c659fc
Author: Andreas Fischer <bantu at owncloud.com>
Date:   Fri Apr 11 21:46:02 2014 +0200

    Better variable names for table arrays.
---
 core/command/db/converttype.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 47e824a..863c739 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -129,10 +129,10 @@ class ConvertType extends Command {
 		$fromTables = $this->getTables($fromDB);
 
 		// warn/fail if there are more tables in 'from' database
-		$tables = array_diff($fromTables, $toTables);
-		if (!empty($tables)) {
+		$extraFromTables = array_diff($fromTables, $toTables);
+		if (!empty($extraFromTables)) {
 			$output->writeln('<comment>The following tables will not be converted:</comment>');
-			$output->writeln($tables);
+			$output->writeln($extraFromTables);
 			if (!$input->getOption('all-apps')) {
 				$output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
 				$output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
@@ -147,8 +147,8 @@ class ConvertType extends Command {
 				return;
 			}
 		}
-		$tables = array_intersect($toTables, $fromTables);
-		$this->convertDB($fromDB, $toDB, $tables, $input, $output);
+		$intersectingTables = array_intersect($toTables, $fromTables);
+		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
 	}
 
 	protected function createSchema(Connection $toDB, InputInterface $input, OutputInterface $output) {

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