Merge commit 'mainline/0.9.x' into 0.9.x

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index 715072d1ee1c40c76067308ea628cc95a3cc6aad..6efa9163dc65550239db89c52d439f00e7af194b 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -141,7 +141,7 @@ class Action extends HTMLOutputter // lawsuit
     function showTitle()
     {
         $this->element('title', null,
-                       sprintf(_("%s - %s"),
+                       sprintf(_("%1$s - %2$s"),
                                $this->title(),
                                common_config('site', 'name')));
     }
@@ -253,6 +253,7 @@ class Action extends HTMLOutputter // lawsuit
                 $this->script('js/jquery.min.js');
                 $this->script('js/jquery.form.js');
                 $this->script('js/jquery.cookie.js');
+                $this->script('js/json2.js');
                 $this->script('js/jquery.joverlay.min.js');
                 Event::handle('EndShowJQueryScripts', array($this));
             }