From 29e7cf1aa5ca0e387fdb61372c7a590def694a2a Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 19 Nov 2010 06:51:01 +0100
Subject: [PATCH] Fix bug #3111254: Search in my_watchlist results in error

---
 doc/ChangeLog                        | 1 +
 src/SemanticScuttle/Service/User.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0a60bff..60401d4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle
 - Fix bug in getTagsForBookmarks() that fetched all tags
 - Fix bug #3073215: Updating bookmark time does not work
 - Fix bug #3074816: French translation breaks edit javascript
+- Fix bug #3111254: Search in my_watchlist results in error
 - Show error message on mysqli connection errors
 - Implement patch #3059829: update FR_CA translation
 - Update php-gettext library to 1.0.10
diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index fd9d84f..9ef8430 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -364,7 +364,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
     public function getCurrentUserId()
     {
         if (isset($_SESSION[$this->getSessionKey()])) {
-            return $_SESSION[$this->getSessionKey()];
+            return (int)$_SESSION[$this->getSessionKey()];
 
         } else if (isset($_COOKIE[$this->getCookieKey()])) {
             $cook = explode(':', $_COOKIE[$this->getCookieKey()]);
@@ -385,10 +385,10 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
 
             if ($row = $this->db->sql_fetchrow($dbresult)) {
                 $this->setCurrentUserId(
-                    $row[$this->getFieldName('primary')]
+                    (int)$row[$this->getFieldName('primary')]
                 );
                 $this->db->sql_freeresult($dbresult);
-                return $_SESSION[$this->getSessionKey()];
+                return (int)$_SESSION[$this->getSessionKey()];
             }
         }
         return false;