diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-15 17:16:35 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-15 17:16:35 -0400 |
| commit | 13147143fc830e81b80ae86bf4cc4f745ce04381 (patch) | |
| tree | 7197e7c3437e028a1bc2358f38ac3964cf3fe6e9 /classes/User.php | |
| parent | e559f82e86c495abdc4cf5fff3d8c6279a808354 (diff) | |
| parent | 4081ed79b02fd06f7c347803478e1f835311c2ab (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/classes/User.php b/classes/User.php index 58f9a6874..11cb4f08b 100644 --- a/classes/User.php +++ b/classes/User.php @@ -103,10 +103,7 @@ class User extends Memcached_DataObject } $toupdate = implode(', ', $parts); - $table = $this->tableName(); - if(common_config('db','quote_identifiers')) { - $table = '"' . $table . '"'; - } + $table = common_database_tablename($this->tableName()); $qry = 'UPDATE ' . $table . ' SET ' . $toupdate . ' WHERE id = ' . $this->id; $orig->decache(); @@ -630,11 +627,7 @@ class User extends Memcached_DataObject 'ORDER BY subscription.created DESC '; if ($offset) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; - } + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; } $profile = new Profile(); @@ -657,11 +650,7 @@ class User extends Memcached_DataObject 'AND subscription.subscribed != subscription.subscriber ' . 'ORDER BY subscription.created DESC '; - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; - } + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; $profile = new Profile(); |