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

Merge pull request #359 from kijin/merge/1.8.18

Browse source 
Merge with XE 1.8.18
This commit is contained in:
Kijin Sung 2016-03-09 09:26:37 +09:00
commit 81c5cf42c3
4 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.editorconfig Normal file
View file

@ -0,0 +1,9 @@
root = true
[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = true
indent_style = tab
indent_size = 4

7
modules/board/board.controller.php
View file

@ -127,6 +127,11 @@ class boardController extends board
}
}
if($this->module_info->use_anonymous == 'Y') {
$obj->member_srl = abs($oDocument->get('member_srl')) * -1;
$oDocument->add('member_srl', $obj->member_srl);
}
if($this->module_info->protect_document_regdate > 0 && $this->grant->manager == false)
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
@ -152,7 +157,7 @@ class boardController extends board
$obj->update_order = $obj->list_order = (getNextSequence() * -1);
}
$obj->reason_update = escape($obj->reason_update);
$output = $oDocumentController->updateDocument($oDocument, $obj);
$output = $oDocumentController->updateDocument($oDocument, $obj, true);
$msg_code = 'success_updated';
// insert a new document otherwise

4
modules/document/document.controller.php
View file

@ -607,8 +607,9 @@ class documentController extends document
{
$obj->password = getModel('member')->hashPassword($obj->password);
}
// If an author is identical to the modifier or history is used, use the logged-in user's information.
if(Context::get('is_logged') && $module_info->use_anonymous != 'Y')
if(Context::get('is_logged') && !$manual_updated && $module_info->use_anonymous != 'Y')
{
$logged_info = Context::get('logged_info');
if($source_obj->get('member_srl')==$logged_info->member_srl)
@ -620,6 +621,7 @@ class documentController extends document
$obj->homepage = $logged_info->homepage;
}
}
// For the document written by logged-in user however no nick_name exists
if($source_obj->get('member_srl')&& !$obj->nick_name)
{

2
modules/rss/rss.class.php
View file

@ -7,6 +7,8 @@
*/
class rss extends ModuleObject
{
public $gzhandler_enable = false;
/**
* Additional tasks required to accomplish during the installation
*