Index: trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php
— — @@ -3,18 +3,11 @@
4 4 * Functions for managing user board data
5 5 */
6 6 class UserBoard {
7 (削除) - /**#@+ (削除ここまで)
8 (削除) - * @private (削除ここまで)
9 (削除) - */ (削除ここまで)
10 (削除) - var $user_id; (削除ここまで)
11 (削除) - var $user_name; (削除ここまで)
12 7
13 8 /**
14 9 * Constructor
15 (削除) - * @private (削除ここまで)
16 10 */
17 (削除) - /* private */ function __construct() { (削除ここまで)
18 (削除) - } (削除ここまで)
11 (追記) + public function __construct() {} (追記ここまで)
19 12
20 13 /**
21 14 * Sends a user board message to another user.
— — @@ -155,9 +148,6 @@
156 149
157 150 $key = wfMemcKey( 'user', 'newboardmessage', $user_id );
158 151 $newCount = 0;
159 (削除) - /* @todo FIXME: why is this commented out? This obviously should be (削除ここまで)
160 (削除) - enabled, because without this, this function is basically identical (削除ここまで)
161 (削除) - to clearNewMessagesCount... (削除ここまで)
162 152 $dbw = wfGetDB( DB_MASTER );
163 153 $s = $dbw->selectRow(
164 154 'user_board',
— — @@ -168,7 +158,6 @@
169 159 if ( $s !== false ) {
170 160 $newCount = $s->count;
171 161 }
172 (削除) - */ (削除ここまで)
173 162
174 163 $wgMemc->set( $key, $newCount );
175 164
— — @@ -205,8 +194,8 @@
206 195 * @return Boolean: true if user owns the message, otherwise false
207 196 */
208 197 public function doesUserOwnMessage( $user_id, $ub_id ) {
209 (削除) - $dbw = wfGetDB( DB_MASTER ); (削除ここまで)
210 (削除) - $s = $dbw->selectRow( (削除ここまで)
198 (追記) + $dbr = wfGetDB( DB_SLAVE ); (追記ここまで)
199 (追記) + $s = $dbr->selectRow( (追記ここまで)
211 200 'user_board',
212 201 array( 'ub_user_id' ),
213 202 array( 'ub_id' => $ub_id ),
— — @@ -391,8 +380,8 @@
392 381 <div class=\"user-board-message-from\">
393 382 <a href=\"{$user->escapeFullURL()}\" title=\"{$message['user_name_from']}\">{$message['user_name_from']}</a> {$message_type_label}
394 383 </div>
395 (削除) - <div class=\"user-board-message-time\">" (削除ここまで)
396 (削除) - . wfMsgHtml( 'userboard_posted_ago', $this->getTimeAgo( $message['timestamp'] ) ) . (削除ここまで)
384 (追記) + <div class=\"user-board-message-time\">" . (追記ここまで)
385 (追記) + wfMsgHtml( 'userboard_posted_ago', $this->getTimeAgo( $message['timestamp'] ) ) . (追記ここまで)
397 386 "</div>
398 387 <div class=\"user-board-message-content\">
399 388 <div class=\"user-board-message-image\">
Index: trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
— — @@ -144,8 +144,8 @@
145 145
146 146 if ( $total ) {
147 147 $output .= '<div class="user-page-message-top">
148 (削除) - <span class="user-page-message-count" style="font-size:11px;color:#666666;">' (削除ここまで)
149 (削除) - . wfMsg( 'userboard_showingmessages', $total, $start, $end, $end - $start + 1 ) . (削除ここまで)
148 (追記) + <span class="user-page-message-count">' . (追記ここまで)
149 (追記) + wfMsg( 'userboard_showingmessages', $total, $start, $end, $end - $start + 1 ) . (追記ここまで)
150 150 "</span> {$board_to_board}
151 151 </div>";
152 152 }
— — @@ -221,7 +221,7 @@
222 222 $output .= '<div class="user-page-message-form">
223 223 <input type="hidden" id="user_name_to" name="user_name_to" value="' . $user_name_to . '"/>
224 224 <input type="hidden" id="user_name_from" name="user_name_from" value="' . $user_name_from . '"/>
225 (削除) - <span style="color:#797979;">' . wfMsg( 'userboard_messagetype' ) . ' </span> (削除ここまで)
225 (追記) + <span class="user-board-message-type">' . wfMsg( 'userboard_messagetype' ) . ' </span> (追記ここまで)
226 226 <select id="message_type">
227 227 <option value="0">' . wfMsg( 'userboard_public' ) . '</option>
228 228 <option value="1">' . wfMsg( 'userboard_private' ) . '</option>
— — @@ -285,7 +285,7 @@
286 286 // $ub_message_text = preg_replace_callback( "/(<a[^>]*>)(.*?)(<\/a>)/i", 'cut_link_text', $ub_message['message_text'] );
287 287 $ub_message_text = $ub_message['message_text'];
288 288
289 (削除) - $output .= "<div class=\"user-board-message\" style=\"width:550px\"> (削除ここまで)
289 (追記) + $output .= "<div class=\"user-board-message\"> (追記ここまで)
290 290 <div class=\"user-board-message-from\">
291 291 <a href=\"{$user->escapeFullURL()}\" title=\"{$ub_message['user_name_from']}}\">{$ub_message['user_name_from']} </a> {$ub_message_type_label}
292 292 </div>
Index: trunk/extensions/SocialProfile/UserBoard/UserBoard.css
— — @@ -37,6 +37,7 @@
38 38 .user-board-message {
39 39 border: 1px solid #D4DFD7;
40 40 margin: 0px 0px 15px 0px;
41 (追記) + width: 550px; (追記ここまで)
41 42 }
42 43
43 44 .user-board-message-from {
— — @@ -102,3 +103,12 @@
103 104 .user-page-message-form textarea {
104 105 width: 80%;
105 106 }
107 (追記) + (追記ここまで)
108 (追記) +.user-page-message-count { (追記ここまで)
109 (追記) + color: #666666; (追記ここまで)
110 (追記) + font-size: 11px; (追記ここまで)
111 (追記) +} (追記ここまで)
112 (追記) + (追記ここまで)
113 (追記) +.user-board-message-type { (追記ここまで)
114 (追記) + color: #797979; (追記ここまで)
115 (追記) +} (追記ここまで)
\ No newline at end of file