Merge pull request #296 from fxdwg/master

Check if qvitternotice is >191 and not 255
This commit is contained in:
Hannes Mannerheim 2015-10-23 00:16:21 +02:00
commit 1218512b4a

View File

@ -109,10 +109,11 @@ class QvitterAdminSettingsAction extends AdminPanelAction
{
// Validate notice text
if (mb_strlen($qvitterNotice) > 255) {
//The column 'value' in table 'config' is varchar(191)
if (mb_strlen($qvitterNotice) > 191) {
$this->clientError(
// TRANS: Client error displayed when a sidebar notice was longer than allowed.
_('Maximum length for the sidebar notice is 255 characters.')
_('Maximum length for the sidebar notice is 191 characters.')
);
}
@ -179,7 +180,7 @@ class QvitterNoticeAdminPanelForm extends AdminForm
_('Qvitter sidebar notice text'),
common_config('site', 'qvitternotice'),
// TRANS: Tooltip for sidebar notice text field in admin panel.
_('Qvitter\'s sidebar notice text (255 characters maximum; HTML allowed)')
_('Qvitter\'s sidebar notice text (191 characters maximum; HTML allowed)')
);
$this->out->elementEnd('li');
@ -194,7 +195,7 @@ class QvitterNoticeAdminPanelForm extends AdminForm
_('Qvitter sidebar notice text (logged out)'),
common_config('site', 'qvitternoticeloggedout'),
// TRANS: Tooltip for sidebar notice text field in admin panel.
_('Qvitter\'s sidebar notice text, when logged out (255 characters maximum; HTML allowed)')
_('Qvitter\'s sidebar notice text, when logged out (191 characters maximum; HTML allowed)')
);
$this->out->elementEnd('li');