merge to trunk

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13176 201d5d3c-b55e-5fd7-737f-ddc643e51545
wesias7 · Sep 30, 2013 · 3b7548f · 3b7548f
1 parent 2d3f149
commit 3b7548f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config/config.inc.php b/config/config.inc.php
@@ -42,7 +42,7 @@
  * '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.

diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
@@ -314,6 +314,8 @@ public function procFileOutput()
 
 		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 @@ public function procFileOutput()
 			fpassthru($fp); 
 		}
 
-		Context::close();
-
 		exit();
 	}
 

diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
@@ -22,7 +22,7 @@ function procMemberAdminInsert()
 	{
 		// 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');