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

merge from 10807, 10815

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10817 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-07-02 05:09:03 +00:00
parent abfcd484bf
commit dc29b17c97
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.inc.php
View file

@ -13,7 +13,7 @@
* @brief display XE's full version * @brief display XE's full version
* Even The file should be revised when releasing altough no change is made * Even The file should be revised when releasing altough no change is made
**/ **/
define('__XE_VERSION__', '1.5.2.6'); define('__XE_VERSION__', '1.5.2.7');
define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead. define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
/** /**

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

@ -1786,9 +1786,9 @@ class documentController extends document {
{ {
// Check login information // Check login information
if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged'); if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
$module_info = Context::get('module_info'); $module_info = Context::get('module_info');
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// Get form information // Get form information
$obj = Context::getRequestVars(); $obj = Context::getRequestVars();
// Change the target module to log-in information // Change the target module to log-in information
@ -1805,8 +1805,17 @@ class documentController extends document {
$oDocumentController = &getController('document'); $oDocumentController = &getController('document');
// Check if already exist geulinji // Check if already exist geulinji
$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager); $oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
// Update if already exists // Update if already exists
if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) { if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) {
if($oDocument->get('module_srl') != $obj->module_srl)
{
return new Object(-1, 'msg_invalid_request');
}
if(!$oDocument->isGranted())
{
return new Object(-1, 'msg_invalid_request');
}
//if exist document status is already public, use temp status can point problem //if exist document status is already public, use temp status can point problem
$obj->status = $oDocument->get('status'); $obj->status = $oDocument->get('status');
$output = $oDocumentController->updateDocument($oDocument, $obj); $output = $oDocumentController->updateDocument($oDocument, $obj);