summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-09 20:01:46 +0100
committerBrion Vibber <brion@pobox.com>2009-11-09 20:01:46 +0100
commit088081675fb7d5250a9b9dfe5015de0822cb5ac2 (patch)
tree6b875217286883172802f0565291e2b4d15a8b5c /lib/util.php
parent8e58f241739b97bd53f78035781f16e2067a31d9 (diff)
Revert "Remove more contractions"
This reverts commit 5ab709b73977131813884558bf56d97172a7aa26. Missed this one yesterday...
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/util.php b/lib/util.php
index b4f5af1af..a4865c46c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,7 @@ function common_init_language()
$locale_set = common_init_locale($language);
setlocale(LC_CTYPE, 'C');
- // So we do not have to make people install the gettext locales
+ // So we don't have to make people install the gettext locales
$path = common_config('site','locale_path');
bindtextdomain("statusnet", $path);
bind_textdomain_codeset("statusnet", "UTF-8");
@@ -139,7 +139,7 @@ function common_check_user($nickname, $password)
}
}
}else{
- //no handler indicated the credentials were valid, and we know their not valid because the user is not in the database
+ //no handler indicated the credentials were valid, and we know their not valid because the user isn't in the database
return false;
}
} else {
@@ -396,7 +396,7 @@ function common_current_user()
}
// Logins that are 'remembered' aren't 'real' -- they're subject to
-// cookie-stealing. So, we do not let them do certain things. New reg,
+// cookie-stealing. So, we don't let them do certain things. New reg,
// OpenID, and password logins _are_ real.
function common_real_login($real=true)
@@ -1147,7 +1147,7 @@ function common_accept_to_prefs($accept, $def = '*/*')
$parts = explode(',', $accept);
foreach($parts as $part) {
- // FIXME: does not deal with params like 'text/html; level=1'
+ // FIXME: doesn't deal with params like 'text/html; level=1'
@list($value, $qpart) = explode(';', trim($part));
$match = array();
if(!isset($qpart)) {
@@ -1346,7 +1346,7 @@ function common_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
}
// FIXME: show error page if we're on the Web
- /* Do not execute PHP internal error handler */
+ /* Don't execute PHP internal error handler */
return true;
}
@@ -1448,7 +1448,7 @@ function common_shorten_url($long_url)
}
global $_shorteners;
if (!isset($_shorteners[$svc])) {
- //the user selected service does not exist, so default to ur1.ca
+ //the user selected service doesn't exist, so default to ur1.ca
$svc = 'ur1.ca';
}
if (!isset($_shorteners[$svc])) {