summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-08 23:28:51 +0100
committerBrion Vibber <brion@pobox.com>2009-11-08 23:28:51 +0100
commitfc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (patch)
tree15174fb81ee17b7d9117d009fd3cc5572168bf51 /classes
parentec6a38a62786c85e8ee30c5726ea81f82465b39d (diff)
Revert "* [Cc]an't -> [Cc]annot"
This reverts commit 0ab17f382b9993ada3d12d4cdace72cca53fb545.
Diffstat (limited to 'classes')
-rw-r--r--classes/File.php2
-rw-r--r--classes/Notice.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/File.php b/classes/File.php
index dd0c3227e..e04a9d525 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -99,7 +99,7 @@ class File extends Memcached_DataObject
} elseif (is_string($redir_data)) {
$redir_url = $redir_data;
} else {
- throw new ServerException("Cannot process url '$given_url'");
+ throw new ServerException("Can't process url '$given_url'");
}
// TODO: max field length
if ($redir_url === $given_url || strlen($redir_url) > 255) {
diff --git a/classes/Notice.php b/classes/Notice.php
index 862d4c762..9886875cb 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -680,7 +680,7 @@ class Notice extends Memcached_DataObject
return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
}
- # Get the cache; if we cannot, just go to the DB
+ # Get the cache; if we can't, just go to the DB
$cache = common_memcache();
@@ -1364,7 +1364,7 @@ class Notice extends Memcached_DataObject
}
}
- // If it's not a "low bandwidth" source (one where you cannot set
+ // If it's not a "low bandwidth" source (one where you can't set
// a reply_to argument), we return. This is mostly web and API
// clients.