diff options
author | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
commit | 5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624 (patch) | |
tree | 5b4092e365023c7729fcdd8260431d3ffb28b519 /plugins/TwitterBridge/twitterauthorization.php | |
parent | 14adb7cc41e3d5d4e543c1f13f7a60d3cadb5c71 (diff) | |
parent | d7d3a50d8751f071aa95541813af1d190e71430e (diff) |
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'plugins/TwitterBridge/twitterauthorization.php')
-rw-r--r-- | plugins/TwitterBridge/twitterauthorization.php | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index bc004cb95..7a896e168 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -332,6 +332,11 @@ class TwitterauthorizationAction extends Action parent::showPage(); } + /** + * @fixme much of this duplicates core code, which is very fragile. + * Should probably be replaced with an extensible mini version of + * the core registration form. + */ function showContent() { if (!empty($this->message_text)) { @@ -353,10 +358,15 @@ class TwitterauthorizationAction extends Action 'name' => 'license', 'value' => 'true')); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); - $this->text(_('My text and files are available under ')); - $this->element('a', array('href' => common_config('license', 'url')), - common_config('license', 'title')); - $this->text(_(' except this private data: password, email address, IM address, phone number.')); + $message = _('My text and files are available under %s ' . + 'except this private data: password, ' . + 'email address, IM address, and phone number.'); + $link = '<a href="' . + htmlspecialchars(common_config('license', 'url')) . + '">' . + htmlspecialchars(common_config('license', 'title')) . + '</a>'; + $this->raw(sprintf(htmlspecialchars($message), $link)); $this->elementEnd('label'); $this->elementEnd('li'); $this->elementEnd('ul'); |