Merge branch '1.0.x' into limitdist2

2011-03-28 21:56:34 -04:00
parent a74eda4e9a 865c1bc278
commit e862dcdb8a
22 changed files with 1008 additions and 79 deletions
--- a/plugins/ClientSideShorten/shorten.php
+++ b/plugins/ClientSideShorten/shorten.php
@@ -57,7 +57,7 @@ class ShortenAction extends Action
        return true;
    }

-    function handle($args)
+    function handle($args=null)
    {
        parent::handle($args);
        header('Content-Type: text/plain');