From f25783ef5de2c4b7f9746eb7ad92fb0b018738b1 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 15 Apr 2014 12:16:31 +0200
Subject: Minor syntax changes for: New toggle buttons to filter articles

See
http://programmers.stackexchange.com/questions/23852/bitwise-or-vs-adding-flags
https://github.com/marienfressinaud/FreshRSS/pull/486
https://github.com/marienfressinaud/FreshRSS/issues/376
---
 app/layout/nav_menu.phtml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 58e561754..9990448ba 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -9,11 +9,11 @@
 	<?php if ($this->loginOk) { ?>
 	<?php $url_state = $this->url;
 		if ($this->state & FreshRSS_Entry::STATE_READ) {
-			$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_READ;
+			$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_READ;
 			$checked = 'true';
 			$class = 'active';
 		} else {
-			$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_READ;
+			$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_READ;
 			$checked = 'false';
 			$class = '';
 		}
@@ -28,11 +28,11 @@
 		</a>
 		<?php
 			if ($this->state & FreshRSS_Entry::STATE_NOT_READ) {
-				$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_NOT_READ;
+				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_READ;
 				$checked = 'true';
 				$class = 'active';
 			} else {
-				$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_NOT_READ;
+				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_READ;
 				$checked = 'false';
 				$class = '';
 			}
@@ -46,11 +46,11 @@
 		</a>
 		<?php
 			if ($this->state & FreshRSS_Entry::STATE_FAVORITE) {
-				$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_FAVORITE;
+				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_FAVORITE;
 				$checked = 'true';
 				$class = 'active';
 			} else {
-				$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_FAVORITE;
+				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_FAVORITE;
 				$checked = 'false';
 				$class = '';
 			}
@@ -64,11 +64,11 @@
 		</a>
 		<?php
 			if ($this->state & FreshRSS_Entry::STATE_NOT_FAVORITE) {
-				$url_state['params']['state'] = $this->state - FreshRSS_Entry::STATE_NOT_FAVORITE;
+				$url_state['params']['state'] = $this->state & ~FreshRSS_Entry::STATE_NOT_FAVORITE;
 				$checked = 'true';
 				$class = 'active';
 			} else {
-				$url_state['params']['state'] = $this->state + FreshRSS_Entry::STATE_NOT_FAVORITE;
+				$url_state['params']['state'] = $this->state | FreshRSS_Entry::STATE_NOT_FAVORITE;
 				$checked = 'false';
 				$class = '';
 			}
-- 
cgit v1.2.3