Browse Source

Merge branch 'develop' of https://github.com/friendica/friendica into 20191001-Vagrant

tags/2019.12
Tobias Diekershoff 1 year ago
parent
commit
2b55c6f8d2
5 changed files with 7 additions and 7 deletions
  1. +1
    -0
      doc/smarty3-templates.md
  2. +3
    -4
      src/Module/Proxy.php
  3. +1
    -1
      src/Module/Register.php
  4. +1
    -1
      src/Protocol/PortableContact.php
  5. +1
    -1
      view/templates/field_textarea.tpl

+ 1
- 0
doc/smarty3-templates.md View File

@@ -177,6 +177,7 @@ Field parameter:
1. Label for the input box,
2. Current text for the box,
3. Help text for the input box.
4. if set to "required" modern browser will check that this input box is filled when submitting the form,

### field_yesno.tpl



+ 3
- 4
src/Module/Proxy.php View File

@@ -287,14 +287,13 @@ class Proxy extends BaseModule
}

/**
* @brief Output a blank image, without cache headers, in case of errors
* In case of an error just stop. We don't return content to avoid caching problems
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function responseError()
{
header('Content-type: image/png');
echo file_get_contents('images/blank.png');
exit();
throw new \Friendica\Network\HTTPException\InternalServerErrorException();
}

/**


+ 1
- 1
src/Module/Register.php View File

@@ -114,7 +114,7 @@ class Register extends BaseModule
$o = Renderer::replaceMacros($tpl, [
'$invitations' => Config::get('system', 'invitation_only'),
'$permonly' => intval(Config::get('config', 'register_policy')) === self::APPROVE,
'$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
'$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node'), 'required'],
'$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
'$invite_label' => L10n::t('Your invitation code: '),
'$invite_id' => $invite_id,


+ 1
- 1
src/Protocol/PortableContact.php View File

@@ -720,7 +720,7 @@ class PortableContact

$server['register_policy'] = Register::CLOSED;

if (is_bool($nodeinfo['openRegistrations']) && $nodeinfo['openRegistrations']) {
if (isset($nodeinfo['openRegistrations']) && is_bool($nodeinfo['openRegistrations']) && $nodeinfo['openRegistrations']) {
$server['register_policy'] = Register::OPEN;
}



+ 1
- 1
view/templates/field_textarea.tpl View File

@@ -1,7 +1,7 @@

<div class="field textarea">
<label for="id_{{$field.0}}">{{$field.1}}</label>
<textarea name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
<textarea name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip"{{if $field.4 eq 'required'}} required{{/if}}>{{$field.2}}</textarea>
{{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}}


Loading…
Cancel
Save