ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 03:30:48 +03:00
Code Issues Releases Wiki Activity

Мелкие исравления

Browse source
This commit is contained in:
Denis Shakhov 2016-03-01 23:08:01 +07:00
parent b493acfee5
commit 6f08e4bef5
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/classes/actions/ActionAjax.class.php
View file

@ -481,7 +481,7 @@ class ActionAjax extends Action
$sCaptchaValidateType = func_camelize('captcha_' . Config::Get('sys.captcha.type'));
if (!$this->Validate_Validate($sCaptchaValidateType, $sValue, array('name' => $sName))) {
$aErrors = $this->Validate_GetErrors();
$this->Viewer_AssignAjax('aErrors', array('captcha' => array(reset($aErrors))));
$this->Viewer_AssignAjax('errors', array('captcha' => array(reset($aErrors))));
}
}

8
application/classes/actions/ActionAuth.class.php
View file

@ -143,7 +143,7 @@ class ActionAuth extends Action
/**
* Получаем ошибки
*/
$this->Viewer_AssignAjax('aErrors', $oUser->_getValidateErrors());
$this->Viewer_AssignAjax('errors', $oUser->_getValidateErrors());
$this->Message_AddErrorSingle(null);
return;
}
@ -274,7 +274,7 @@ class ActionAuth extends Action
*/
protected function EventAjaxValidateEmail()
{
$this->ValidateFields(array(array('field' => 'email', 'value' => getRequest('email'))));
$this->ValidateFields(array(array('field' => 'mail', 'value' => getRequest('mail'))));
}
/**
@ -339,7 +339,7 @@ class ActionAuth extends Action
/**
* Получаем ошибки
*/
$this->Viewer_AssignAjax('aErrors', $oUser->_getValidateErrors());
$this->Viewer_AssignAjax('errors', $oUser->_getValidateErrors());
}
}
@ -435,7 +435,7 @@ class ActionAuth extends Action
/**
* Получаем ошибки
*/
$this->Viewer_AssignAjax('aErrors', $oUser->_getValidateErrors());
$this->Viewer_AssignAjax('errors', $oUser->_getValidateErrors());
}
}

4
application/frontend/components/activity/event.tpl
View file

@ -34,9 +34,7 @@
</time>
{* Логин *}
<a href="{$user->getUserWebPath()}" class="{$component}-username">
{$user->getDisplayName()}
</a>
<a href="{$user->getUserWebPath()}" class="{$component}-username">{$user->getDisplayName()}</a>
{* Текст события *}
{if $type == 'add_topic'}

6
application/frontend/skin/developer/assets/js/init.js
View file

@ -40,8 +40,10 @@ jQuery(document).ready(function($){
/**
* Подтверждение удаления
*/
$('.js-confirm-remove-default').lsConfirm({
message: ls.lang.get('common.remove_confirm')
$('.js-confirm-remove-default').livequery(function () {
$(this).lsConfirm({
message: ls.lang.get('common.remove_confirm')
});
});

2
framework

@ -1 +1 @@
Subproject commit 13717ef65ec9d1d630427151a6981615db40b123
Subproject commit 60ee71ff475505a396f26a7a813eafebc7d0b300