summaryrefslogtreecommitdiffstats
path: root/lib/class/user.class.php
diff options
context:
space:
mode:
authorPaul 'flowerysong' Arthur <flowerysong00@yahoo.com>2010-03-14 20:14:52 +0000
committerPaul 'flowerysong' Arthur <flowerysong00@yahoo.com>2010-03-14 20:14:52 +0000
commit1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc (patch)
tree54655ff3e692a71a17f1d37cd97374b263557ca1 /lib/class/user.class.php
parentef48bf3fbdca2a4d25f5d025f4c6ad23905e5369 (diff)
downloadampache-1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc.tar.gz
ampache-1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc.tar.bz2
ampache-1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc.zip
Cosmetics: remove trailing whitespace
Diffstat (limited to 'lib/class/user.class.php')
-rw-r--r--lib/class/user.class.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 4ba750d1..f4bc68b5 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -198,9 +198,9 @@ class User extends database_object {
$sql = "SELECT preference.name, preference.description, preference.catagory, preference.level, user_preference.value " .
"FROM preference INNER JOIN user_preference ON user_preference.preference=preference.id " .
- "WHERE user_preference.user='$user_id' " . $user_limit .
+ "WHERE user_preference.user='$user_id' " . $user_limit .
" ORDER BY preference.catagory, preference.description";
-
+
$db_results = Dba::read($sql);
/* Ok this is crapy, need to clean this up or improve the code FIXME */
@@ -729,10 +729,10 @@ class User extends database_object {
/* Get Users Last ip */
if (count($data = $this->get_ip_history(1))) {
$this->ip_history = inet_ntop($data['0']['ip']);
- }
- else {
- $this->ip_history = _('Not Enough Data');
- }
+ }
+ else {
+ $this->ip_history = _('Not Enough Data');
+ }
} // format_user