summaryrefslogtreecommitdiff
path: root/classes/Profile.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-08 21:41:43 -0500
committerEvan Prodromou <evan@status.net>2009-11-08 21:41:43 -0500
commit691beefd0f3755bab195279b1c0d7cc583942b72 (patch)
tree8c2e51f14d45759e57639ae90e999c192dcd0a17 /classes/Profile.php
parent76b0e6e6f4151235d5032d1aa90f0937b415bd87 (diff)
parentaa0d9a86152d2485de6de5ec572ae87085ebe780 (diff)
Merge branch '0.9.x' into adminpanel
Diffstat (limited to 'classes/Profile.php')
-rw-r--r--classes/Profile.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/Profile.php b/classes/Profile.php
index 7c1e9db33..a50f4951d 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -101,7 +101,7 @@ class Profile extends Memcached_DataObject
}
foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
- # We don't do a scaled one if original is our scaled size
+ # We do not do a scaled one if original is our scaled size
if (!($avatar->width == $size && $avatar->height == $size)) {
$scaled_filename = $imagefile->resize($size);
@@ -174,7 +174,7 @@ class Profile extends Memcached_DataObject
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
{
- // XXX: I'm not sure this is going to be any faster. It probably isn't.
+ // XXX: I'm not sure this is going to be any faster. It probably is not.
$ids = Notice::stream(array($this, '_streamDirect'),
array(),
'profile:notice_ids:' . $this->id,