Merge pull request #890 from tobiasd/bbcode_in_registertext
add bbcode support for the page register textfield (close #871)
This commit is contained in:
commit
d1befd9069
|
@ -1,6 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once('include/email.php');
|
require_once('include/email.php');
|
||||||
|
require_once('include/bbcode.php');
|
||||||
|
|
||||||
if(! function_exists('register_post')) {
|
if(! function_exists('register_post')) {
|
||||||
function register_post(&$a) {
|
function register_post(&$a) {
|
||||||
|
@ -263,7 +264,7 @@ function register_content(&$a) {
|
||||||
'$realpeople' => $realpeople,
|
'$realpeople' => $realpeople,
|
||||||
'$regtitle' => t('Registration'),
|
'$regtitle' => t('Registration'),
|
||||||
'$registertext' =>((x($a->config,'register_text'))
|
'$registertext' =>((x($a->config,'register_text'))
|
||||||
? '<div class="error-message">' . $a->config['register_text'] . '</div>'
|
? bbcode($a->config['register_text'])
|
||||||
: "" ),
|
: "" ),
|
||||||
'$fillwith' => $fillwith,
|
'$fillwith' => $fillwith,
|
||||||
'$fillext' => $fillext,
|
'$fillext' => $fillext,
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
{{*
|
|
||||||
* AUTOMATICALLY GENERATED TEMPLATE
|
|
||||||
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
|
|
||||||
*
|
|
||||||
*}}
|
|
||||||
<h3>{{$regtitle}}</h3>
|
<h3>{{$regtitle}}</h3>
|
||||||
|
|
||||||
<form action="register" method="post" id="register-form">
|
<form action="register" method="post" id="register-form">
|
||||||
|
|
||||||
<input type="hidden" name="photo" value="{{$photo}}" />
|
<input type="hidden" name="photo" value="{{$photo}}" />
|
||||||
|
|
||||||
{{$registertext}}
|
{{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
|
||||||
|
|
||||||
|
|
||||||
<p id="register-realpeople">{{$realpeople}}</p>
|
<p id="register-realpeople">{{$realpeople}}</p>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue