fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-01 00:02:21 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-03-23 20:06:52 +09:00
commit 5223135f37
12 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/board/board.admin.controller.php
View file

@ -47,7 +47,7 @@ class boardAdminController extends board {
if($args->use_anonymous != 'Y') $args->use_anonymous = 'N';
if($args->consultation != 'Y') $args->consultation = 'N';
if($args->protect_content!= 'Y') $args->protect_content = 'N';
if(!in_array($args->order_target,$this->order_target) && !in_array($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
if(!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
// if there is an existed module

4
modules/comment/comment.admin.controller.php
View file

@ -495,7 +495,9 @@ class commentAdminController extends comment
//already comment deleted, therefore only comment log delete
$oCommentController = getController('comment');
$output = $oCommentController->deleteCommentLog($oComment->get('comment_srl'));
$args = new stdClass();
$args->comment_srl = $oComment->get('comment_srl');
$output = $oCommentController->deleteCommentLog($args);
return $output;
}

2
modules/communication/communication.controller.php
View file

@ -153,7 +153,7 @@ class communicationController extends communication
else
{
$this->setMessage('success_sended');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('','act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
$this->setRedirectUrl($returnUrl);
}
}

1
modules/communication/m.skins/default/send_message.html
View file

@ -17,6 +17,7 @@
<input type="hidden" name="source_content" value="{htmlspecialchars($source_message->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" />
<input type="hidden" name="content" value="" />
<input type="hidden" name="xe_validator_id" value="modules/communication/m.skins/default/send_message/1" />
<input type="hidden" name="success_return_url" value="{getNotEncodedUrl('','act', 'dispCommunicationSendMessage', 'receiver_srl', $receiver_info->member_srl)}" />
<ul>
<li>
<span class="memberInfo">{$receiver_info->nick_name}</span>

2
modules/member/lang/lang.xml
View file

@ -1363,7 +1363,7 @@
<item name="msg_success_authed">
<value xml:lang="ko"><![CDATA[인증이 정상적으로 되어 임시 비밀번호로 변경 처리가 되었습니다.\n꼭 인증 메일에 표시된 비밀번호를 이용하여 원하는 비밀번호로 변경하세요.]]></value>
<value xml:lang="en"><![CDATA[Your account has been successfully activated and logged on.\n Please modify the password to your own one with the password in the mail.]]></value>
<value xml:lang="jp"><![CDATA[認証が正常に行われ、ログインできました。\n必ず確認メールに記載されたパスワードを利用してお好みのパスワードに変更してください。]]></value>
<value xml:lang="jp"><![CDATA[パスワードは、一時的なパスワードに変更されます。\n必ず確認メールに記載されたパスワードを利用してお好みのパスワードに変更してください。]]></value>
<value xml:lang="zh-CN"><![CDATA[新的注册信息已得到认证。请用邮件中的新密码修改您要想使用的密码。]]></value>
<value xml:lang="zh-TW"><![CDATA[帳號認證成功，請登入後用郵件中的新密碼修改成想要使用的密碼。]]></value>
<value xml:lang="fr"><![CDATA[Votre compte a été certifié avec succès et ouvert une session. \n Modifiez le Mot de Passe après vous ouvrez une session en utilisant le Mot de Passe dans le mél.]]></value>

2
modules/member/skins/default/signup_form.html
View file

@ -82,7 +82,7 @@ jQuery(function($){
$.extend(option,$.datepicker.regional['{$lang_type}']);
$(".inputDate").datepicker(option);
$(".dateRemover").click(function() {
$(this).parent().prevAll('input').val('');
$(this).prevAll('input').val('');
return false;});
});
})(jQuery);

9
modules/module/module.model.php
View file

@ -662,11 +662,14 @@ class moduleModel extends module
function getTrigger($trigger_name, $module, $type, $called_method, $called_position)
{
$triggers = $this->getTriggers($trigger_name, $called_position);
foreach($triggers as $item)
if($triggers && is_object($triggers))
{
if($item->module == $module && $item->type == $type && $item->called_method == $called_method)
foreach($triggers as $item)
{
return $item;
if($item->module == $module && $item->type == $type && $item->called_method == $called_method)
{
return $item;
}
}
}