From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 1 Jun 2014 12:14:30 +0000 (+0200)
Subject: Simplify AppConfig->getValues()
X-Git-Tag: v7.0.0alpha2~136^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a4949f4b31e86650ac2ccfe547fa64494b08dbff;p=nextcloud-server.git

Simplify AppConfig->getValues()
---

diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index d4ad20816eb..196d04aa9a5 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -251,28 +251,18 @@ class AppConfig implements \OCP\IAppConfig {
 			return false;
 		}
 
-		$fields = '`configvalue`';
-		$where = 'WHERE';
-		$params = array();
 		if ($app !== false) {
-			$fields .= ', `configkey`';
-			$where .= ' `appid` = ?';
-			$params[] = $app;
-			$key = 'configkey';
+			return $this->getAppValues($app);
 		} else {
-			$fields .= ', `appid`';
-			$where .= ' `configkey` = ?';
-			$params[] = $key;
-			$key = 'appid';
-		}
-		$query = 'SELECT ' . $fields . ' FROM `*PREFIX*appconfig` ' . $where;
-		$result = $this->conn->executeQuery($query, $params);
+			$query = 'SELECT `configvalue`, `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = ?';
+			$result = $this->conn->executeQuery($query, array($key));
 
-		$values = array();
-		while ($row = $result->fetch((\PDO::FETCH_ASSOC))) {
-			$values[$row[$key]] = $row['configvalue'];
-		}
+			$values = array();
+			while ($row = $result->fetch((\PDO::FETCH_ASSOC))) {
+				$values[$row['appid']] = $row['configvalue'];
+			}
 
-		return $values;
+			return $values;
+		}
 	}
 }