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

merge to trunk

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13176 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-30 22:58:41 +00:00
parent 2d3f149b5a
commit 3b7548ff52
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.inc.php
View file

@ -42,7 +42,7 @@ define('__ZBXE__', __XE__);
* '2' means 'release candidate' status.
* '3' means 'final' status.
*/
define('__XE_VERSION__', '1.7.3.5');
define('__XE_VERSION__', '1.7.3.6');
/**
* @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.

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

@ -314,6 +314,8 @@ class fileController extends file
unset($_SESSION[$session_key][$file_srl]);
Context::close();
$fp = fopen($uploaded_filename, 'rb');
if(!$fp) return $this->stop('msg_file_not_found');
@ -337,8 +339,6 @@ class fileController extends file
fpassthru($fp);
}
Context::close();
exit();
}

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

@ -22,7 +22,7 @@ class memberAdminController extends member
{
// if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
// Extract the necessary information in advance
$logged_info = Context::get('loggd_info');
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' || !checkCSRF())
{
return new Object(-1, 'msg_invalid_request');