1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-07 17:33:32 +02:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2016-11-16 21:53:30 +01:00
commit 4844370c26
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -1044,7 +1044,7 @@ class acp_board
$user->timezone = $old_tz;
return "<select name=\"dateoptions\" id=\"dateoptions\" onchange=\"if (this.value == 'custom') { document.getElementById('" . addslashes($key) . "').value = '" . addslashes($value) . "'; } else { document.getElementById('" . addslashes($key) . "').value = this.value; }\">$dateformat_options</select>
<input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"30\" />";
<input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"64\" />";
}
/**