summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/Foreign_link.php6
-rw-r--r--classes/Notice.php16
-rw-r--r--classes/Queue_item.php2
-rw-r--r--classes/User.php8
4 files changed, 16 insertions, 16 deletions
diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index 79a4d262d..9027ab901 100644
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -35,7 +35,7 @@ class Foreign_link extends Memcached_DataObject
$flink->user_id = $user_id;
$flink->limit(1);
- if ($flink->find(TRUE)) {
+ if ($flink->find(true)) {
return $flink;
}
@@ -48,7 +48,7 @@ class Foreign_link extends Memcached_DataObject
$flink->foreign_id = $foreign_id;
$flink->limit(1);
- if ($flink->find(TRUE)) {
+ if ($flink->find(true)) {
return $flink;
}
@@ -64,7 +64,7 @@ class Foreign_link extends Memcached_DataObject
$fuser->limit(1);
- if ($fuser->find(TRUE)) {
+ if ($fuser->find(true)) {
return $fuser;
}
diff --git a/classes/Notice.php b/classes/Notice.php
index d3aa4e828..3eb653066 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -321,19 +321,19 @@ class Notice extends Memcached_DataObject
static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since) {
- $needAnd = FALSE;
- $needWhere = TRUE;
+ $needAnd = false;
+ $needWhere = true;
if (preg_match('/\bWHERE\b/i', $qry)) {
- $needWhere = FALSE;
- $needAnd = TRUE;
+ $needWhere = false;
+ $needAnd = true;
}
if ($since_id > 0) {
if ($needWhere) {
$qry .= ' WHERE ';
- $needWhere = FALSE;
+ $needWhere = false;
} else {
$qry .= ' AND ';
}
@@ -345,7 +345,7 @@ class Notice extends Memcached_DataObject
if ($needWhere) {
$qry .= ' WHERE ';
- $needWhere = FALSE;
+ $needWhere = false;
} else {
$qry .= ' AND ';
}
@@ -357,7 +357,7 @@ class Notice extends Memcached_DataObject
if ($needWhere) {
$qry .= ' WHERE ';
- $needWhere = FALSE;
+ $needWhere = false;
} else {
$qry .= ' AND ';
}
@@ -411,7 +411,7 @@ class Notice extends Memcached_DataObject
# On a cache hit, return a DB-object-like wrapper
- if ($notices !== FALSE) {
+ if ($notices !== false) {
$wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
return $wrapper;
}
diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 1b34d8ab4..9b909ec22 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -34,7 +34,7 @@ class Queue_item extends Memcached_DataObject
$qi->limit(1);
- $cnt = $qi->find(TRUE);
+ $cnt = $qi->find(true);
if ($cnt) {
# XXX: potential race condition
diff --git a/classes/User.php b/classes/User.php
index 90d0ccfe0..92ff8776b 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -199,7 +199,7 @@ class User extends Memcached_DataObject
if (!$id) {
common_log_db_error($profile, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
$user = new User();
@@ -233,7 +233,7 @@ class User extends Memcached_DataObject
if (!$result) {
common_log_db_error($user, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
# Everyone is subscribed to themself
@@ -247,7 +247,7 @@ class User extends Memcached_DataObject
if (!$result) {
common_log_db_error($subscription, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
if ($email && !$user->email) {
@@ -261,7 +261,7 @@ class User extends Memcached_DataObject
$result = $confirm->insert();
if (!$result) {
common_log_db_error($confirm, 'INSERT', __FILE__);
- return FALSE;
+ return false;
}
}