Completed
Pull Request — master (#165)
by Stephanie
02:25
created
classes/views/frm-settings/inbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 			</h3>
15 15
 			<span class="frm_inbox_date">
16 16
 				<?php
17
-				if ( ! isset( $message['read'] ) || ! isset( $message['read'][ get_current_user_id() ] ) ) {
17
+				if ( ! isset( $message['read'] ) || ! isset( $message['read'][get_current_user_id()] ) ) {
18 18
 					$inbox->mark_read( $key );
19 19
 					?>
20 20
 					<span class="frm_inbox_unread"></span>
Please login to merge, or discard this patch.
classes/controllers/FrmAppController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	private static function get_notice_count() {
25 25
 		FrmFormMigratorsHelper::maybe_add_to_inbox();
26 26
 
27
-		$inbox  = new FrmInbox();
27
+		$inbox = new FrmInbox();
28 28
 		return $inbox->unread_html();
29 29
 	}
30 30
 
Please login to merge, or discard this patch.
classes/models/FrmInbox.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
76 76
 
77 77
 		$removed  = false;
78 78
 		foreach ( $this->messages as $t => $message ) {
79
-			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
79
+			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
80 80
 			$expired = isset( $message['expires'] ) && ! empty( $message['expires'] ) && $message['expires'] < time();
81 81
 			if ( $read || $expired ) {
82
-				unset( $this->messages[ $t ] );
82
+				unset( $this->messages[$t] );
83 83
 				$removed = true;
84 84
 			}
85 85
 		}
@@ -96,15 +96,15 @@  discard block
 block discarded – undo
96 96
 		$this->set_messages( 'skip' );
97 97
 		$time = isset( $message['time'] ) ? $message['time'] : time();
98 98
 
99
-		if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
99
+		if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) {
100 100
 			// Don't replace messages unless required.
101 101
 			return;
102 102
 		} else {
103 103
 			// Move up and mark as new.
104
-			unset( $this->messages[ $message['key'] ] );
104
+			unset( $this->messages[$message['key']] );
105 105
 		}
106 106
 
107
-		$this->messages[ $message['key'] ] = array(
107
+		$this->messages[$message['key']] = array(
108 108
 			'created' => $time,
109 109
 			'message' => $message['message'],
110 110
 			'subject' => $message['subject'],
@@ -123,14 +123,14 @@  discard block
 block discarded – undo
123 123
 	 */
124 124
 	public function mark_read( $key ) {
125 125
 		$this->set_messages();
126
-		if ( ! isset( $this->messages[ $key ] ) ) {
126
+		if ( ! isset( $this->messages[$key] ) ) {
127 127
 			return;
128 128
 		}
129 129
 
130
-		if ( ! isset( $this->messages[ $key ]['read'] ) ) {
131
-			$this->messages[ $key ]['read'] = array();
130
+		if ( ! isset( $this->messages[$key]['read'] ) ) {
131
+			$this->messages[$key]['read'] = array();
132 132
 		}
133
-		$this->messages[ $key ]['read'][ get_current_user_id() ] = time();
133
+		$this->messages[$key]['read'][get_current_user_id()] = time();
134 134
 
135 135
 		$this->update_list();
136 136
 	}
@@ -139,8 +139,8 @@  discard block
 block discarded – undo
139 139
 		$messages = $this->get_messages();
140 140
 		$user_id  = get_current_user_id();
141 141
 		foreach ( $messages as $t => $message ) {
142
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
143
-				unset( $messages[ $t ] );
142
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
143
+				unset( $messages[$t] );
144 144
 			}
145 145
 		}
146 146
 		return $messages;
Please login to merge, or discard this patch.