Browse Source

Merge branch 'master' of http://git.wheeparam.com/wheeparam/WheeparamBoard

# Conflicts:
#	public_html/assets/css/admin.min.css.map
#	public_html/assets/css/desktop.min.css.map
#	public_html/assets/css/mobile.min.css.map
master
장선근 5 years ago
parent
commit
5fb56e6e76
  1. 2
      public_html/assets/css/admin.min.css.map
  2. 2
      public_html/assets/css/desktop.min.css.map
  3. 2
      public_html/assets/css/mobile.min.css.map
  4. 1
      wheeparam/application/libraries/Boardlib.php

2
public_html/assets/css/admin.min.css.map
File diff suppressed because it is too large
View File

2
public_html/assets/css/desktop.min.css.map
File diff suppressed because it is too large
View File

2
public_html/assets/css/mobile.min.css.map
File diff suppressed because it is too large
View File

1
wheeparam/application/libraries/Boardlib.php

@ -915,6 +915,7 @@ class Boardlib {
// 댓글 목록 // 댓글 목록
$list_skin_path = DIR_SKIN . "/board/comment/" . $this->CI->data['board']['brd_skin_c'] . "/c_list"; $list_skin_path = DIR_SKIN . "/board/comment/" . $this->CI->data['board']['brd_skin_c'] . "/c_list";
$this->CI->data['comment_list'] = array();
if( $this->CI->data['board']['brd_use_comment'] == 'Y' ) if( $this->CI->data['board']['brd_use_comment'] == 'Y' )
{ {
$mem_useridx = $this->CI->member->is_login(); $mem_useridx = $this->CI->member->is_login();

Loading…
Cancel
Save