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

addons/member_communication/member_communication.addon.php

@@ -74,10 +74,10 @@ elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc'
 		$oMemberController = getController('member');
 		// Add a menu for sending message
 		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'module', 'communication', 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
+			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
 		// Add a menu for listing friends (if a friend is new)
 		if(!$oCommunicationModel->isAddedFriend($member_srl))
-			$oMemberController->addMemberPopupMenu(getUrl('', 'module', 'communication', 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
+			$oMemberController->addMemberPopupMenu(getUrl('', 'mid', Context::get('cur_mid'), 'act', 'dispCommunicationAddFriend', 'target_srl', $member_srl), 'cmd_add_friend', '', 'popup');
 	}
 }
 /* End of file member_communication.addon.php */

classes/db/DBCubrid.class.php

@@ -479,7 +479,7 @@ class DBCubrid extends DB
 	 * @param boolean $notnull not null status, default value is false
 	 * @return void
 	 */
-	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = '', $notnull = FALSE)
+	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = FALSE)
 	{
 		$type = strtoupper($this->column_type[$type]);
 		if($type == 'INTEGER')
@@ -506,7 +506,7 @@ class DBCubrid extends DB
 			$query .= sprintf("%s ", $type);
 		}
 
-		if($default)
+		if(isset($default))
 		{
 			if($type == 'INTEGER' || $type == 'BIGINT' || $type == 'INT')
 			{

classes/db/DBMssql.class.php

@@ -377,7 +377,7 @@ class DBMssql extends DB
 	 * @param boolean $notnull not null status, default value is false
 	 * @return void
 	 */
-	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = '', $notnull = false)
+	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
 		if($this->isColumnExists($table_name, $column_name))
 		{
@@ -399,7 +399,7 @@ class DBMssql extends DB
 			$query .= sprintf(" %s ", $type);
 		}
 
-		if($default)
+		if(isset($default))
 		{
 			$query .= sprintf(" default '%s' ", $default);
 		}

classes/db/DBMysql.class.php

@@ -299,7 +299,7 @@ class DBMysql extends DB
 	 * @param boolean $notnull not null status, default value is false
 	 * @return void
 	 */
-	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = '', $notnull = false)
+	function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = null, $notnull = false)
 	{
 		$type = $this->column_type[$type];
 		if(strtoupper($type) == 'INTEGER')
@@ -316,7 +316,7 @@ class DBMysql extends DB
 		{
 			$query .= sprintf(" %s ", $type);
 		}
-		if($default)
+		if(isset($default))
 		{
 			$query .= sprintf(" default '%s' ", $default);
 		}

classes/display/DisplayHandler.class.php

@@ -84,10 +84,6 @@ class DisplayHandler extends Handler
 		}
 
 		// header output
-		if($this->gz_enabled)
-		{
-			header("Content-Encoding: gzip");
-		}
 
 		$httpStatusCode = $oModule->getHttpStatusCode();
 		if($httpStatusCode && $httpStatusCode != 200)
@@ -114,9 +110,17 @@ class DisplayHandler extends Handler
 		$this->content_size = strlen($output);
 		$output .= $this->_debugOutput();
 
+		// disable gzip if output already exists
+		ob_flush();
+		if(headers_sent())
+		{
+			$this->gz_enabled = FALSE;
+		}
+
 		// results directly output
 		if($this->gz_enabled)
 		{
+			header("Content-Encoding: gzip");
 			print ob_gzhandler($output, 5);
 		}
 		else

modules/board/board.admin.controller.php

@@ -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

modules/comment/comment.admin.controller.php

@@ -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;
 	}
 

modules/communication/communication.controller.php

@@ -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);
 			}
 		}

modules/communication/m.skins/default/send_message.html

@@ -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>

modules/member/lang/lang.xml

@@ -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>

modules/member/skins/default/signup_form.html

@@ -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);

modules/module/module.model.php

@@ -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;
+				}
 			}
 		}