summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2009-04-08 22:11:58 +0100
committerCiaranG <ciaran@ciarang.com>2009-04-08 22:11:58 +0100
commit85873b1f2b5b6a3e065cf5d227df31380b6f239e (patch)
tree98026e5fdd03e33fa872204a227b102dcca3cf7a
parent070cd3533c3474dc065c6681befb92dac51f4bf7 (diff)
parent18c8a55ba61e507f08162149273a9a33b9b73ca0 (diff)
Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master
-rw-r--r--actions/featured.php5
-rw-r--r--classes/Notice.php2
-rw-r--r--lib/featureduserssection.php9
-rw-r--r--lib/util.php13
4 files changed, 25 insertions, 4 deletions
diff --git a/actions/featured.php b/actions/featured.php
index f3bade6a5..86fd3f374 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -107,6 +107,7 @@ class FeaturedAction extends Action
$featured_nicks = common_config('nickname', 'featured');
+
if (count($featured_nicks) > 0) {
$quoted = array();
@@ -118,7 +119,7 @@ class FeaturedAction extends Action
$user = new User;
$user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted)));
$user->limit(($this->page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
- $user->orderBy('user.nickname ASC');
+ $user->orderBy(common_database_tablename('user') .'.nickname ASC');
$user->find();
@@ -145,4 +146,4 @@ class FeaturedAction extends Action
$this->page, 'featured');
}
}
-} \ No newline at end of file
+}
diff --git a/classes/Notice.php b/classes/Notice.php
index 44a6aeb98..5fa0d79a1 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -67,6 +67,8 @@ class Notice extends Memcached_DataObject
$this->blowSubsCache(true);
$this->query('BEGIN');
+ //Null any notices that are replies to this notice
+ $this->query(sprintf("UPDATE notice set reply_to = null WHERE reply_to = %d", $this->id));
$related = array('Reply',
'Fave',
'Notice_tag',
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index aed94b1a5..4b9238d47 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -57,9 +57,14 @@ class FeaturedUsersSection extends ProfileSection
$quoted[] = "'$nick'";
}
+ $table = "user";
+ if(common_config('db','quote_identifiers')) {
+ $table = '"' . $table . '"';
+ }
+
$qry = 'SELECT profile.* ' .
- 'FROM profile JOIN user on profile.id = user.id ' .
- 'WHERE user.nickname in (' . implode(',', $quoted) . ') ' .
+ 'FROM profile JOIN '. $table .' on profile.id = '. $table .'.id ' .
+ 'WHERE '. $table .'.nickname in (' . implode(',', $quoted) . ') ' .
'ORDER BY profile.created DESC ';
$limit = PROFILES_PER_SECTION + 1;
diff --git a/lib/util.php b/lib/util.php
index b17a44bd8..675ff51f0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1321,3 +1321,16 @@ function common_compatible_license($from, $to)
// XXX: better compatibility check needed here!
return ($from == $to);
}
+
+/**
+ * returns a quoted table name, if required according to config
+ */
+function common_database_tablename($tablename)
+{
+
+ if(common_config('db','quote_identifiers')) {
+ $tablename = '"'. $tablename .'"';
+ }
+ //table prefixes could be added here later
+ return $tablename;
+} \ No newline at end of file