From c52ae17df480603f9ae47cb915f3a9895f7a5bcd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Jan 2014 08:40:52 +0100 Subject: [PATCH 1/4] add bbcode support for the page register textfield (Bug #871) --- mod/register.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/register.php b/mod/register.php index 1370eb42f1..c00d2315ce 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,6 +1,7 @@ $realpeople, '$regtitle' => t('Registration'), '$registertext' =>((x($a->config,'register_text')) - ? '
' . $a->config['register_text'] . '
' + ? '
' . bbcode($a->config['register_text']) . '
' : "" ), '$fillwith' => $fillwith, '$fillext' => $fillext, From b84502c4e66e4e002c5f89aeae8d628b5d154220 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 13 Jan 2014 14:40:26 +0100 Subject: [PATCH 2/4] move
to the register.tpl --- mod/register.php | 2 +- view/templates/register.tpl | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/mod/register.php b/mod/register.php index c00d2315ce..5e011cb9a9 100644 --- a/mod/register.php +++ b/mod/register.php @@ -264,7 +264,7 @@ function register_content(&$a) { '$realpeople' => $realpeople, '$regtitle' => t('Registration'), '$registertext' =>((x($a->config,'register_text')) - ? '
' . bbcode($a->config['register_text']) . '
' + ? bbcode($a->config['register_text']) : "" ), '$fillwith' => $fillwith, '$fillext' => $fillext, diff --git a/view/templates/register.tpl b/view/templates/register.tpl index ff650e2470..4b74e54f70 100644 --- a/view/templates/register.tpl +++ b/view/templates/register.tpl @@ -1,15 +1,11 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$regtitle}}

- {{$registertext}} + {{if $registertext != ""}}
'{{$registertext}} '
'{{/if}} +

{{$realpeople}}

From 1e87780f5dffdd9b2e3a18b0139a1d1368399de3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 13 Jan 2014 14:45:37 +0100 Subject: [PATCH 3/4] removed copy and paste leftover --- view/templates/register.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/register.tpl b/view/templates/register.tpl index 4b74e54f70..120855ecaa 100644 --- a/view/templates/register.tpl +++ b/view/templates/register.tpl @@ -4,7 +4,7 @@ - {{if $registertext != ""}}
'{{$registertext}} '
'{{/if}} + {{if $registertext != ""}}
'{{$registertext}}
{{/if}}

{{$realpeople}}

From 2cc72a1bc75451a69d0f4f31bbedb3259e416269 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 13 Jan 2014 14:49:49 +0100 Subject: [PATCH 4/4] removed copy and paste leftover --- view/templates/register.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/register.tpl b/view/templates/register.tpl index 120855ecaa..15fcf29938 100644 --- a/view/templates/register.tpl +++ b/view/templates/register.tpl @@ -4,7 +4,7 @@ - {{if $registertext != ""}}
'{{$registertext}}
{{/if}} + {{if $registertext != ""}}
{{$registertext}}
{{/if}}

{{$realpeople}}