diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php index fb048ab99..8986d8b59 100644 --- a/addons/member_communication/member_communication.addon.php +++ b/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 */ diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php index 28eb0d81a..064ae99ab 100644 --- a/classes/db/DBCubrid.class.php +++ b/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') { diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php index f53b32ac4..5a7217735 100644 --- a/classes/db/DBMssql.class.php +++ b/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); } diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php index 35a0d1ec1..9e60f410e 100644 --- a/classes/db/DBMysql.class.php +++ b/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); } diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 4ee8f25aa..e4bca38da 100644 --- a/classes/display/DisplayHandler.class.php +++ b/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 diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php index 70ff93c36..9218bcee3 100644 --- a/modules/board/board.admin.controller.php +++ b/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 diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index efb01180e..2436fd611 100644 --- a/modules/comment/comment.admin.controller.php +++ b/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; } diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index edc57d648..69cba0d09 100644 --- a/modules/communication/communication.controller.php +++ b/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); } } diff --git a/modules/communication/m.skins/default/send_message.html b/modules/communication/m.skins/default/send_message.html index 74a56e491..00a563899 100644 --- a/modules/communication/m.skins/default/send_message.html +++ b/modules/communication/m.skins/default/send_message.html @@ -17,6 +17,7 @@ +