Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

2009-01-22 12:35:25 +01:00
parent 6a3204d08e f89f6a8eb0
commit a2a2dd88b5
39 changed files with 1419 additions and 445 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -1588,11 +1588,6 @@ function common_session_token()
    return $_SESSION['token'];
 }

-function common_nudge_response()
-{
-    common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
-}
-
 function common_cache_key($extra)
 {
    return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;