aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug #3111254: Search in my_watchlist results in error

Browse source
This commit is contained in:
Christian Weiske 2010-11-19 06:51:01 +01:00
parent 77f4b48f9d
commit 29e7cf1aa5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ChangeLog
View file

@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle
- Fix bug in getTagsForBookmarks() that fetched all tags - Fix bug in getTagsForBookmarks() that fetched all tags
- Fix bug #3073215: Updating bookmark time does not work - Fix bug #3073215: Updating bookmark time does not work
- Fix bug #3074816: French translation breaks edit javascript - 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 - Show error message on mysqli connection errors
- Implement patch #3059829: update FR_CA translation - Implement patch #3059829: update FR_CA translation
- Update php-gettext library to 1.0.10 - Update php-gettext library to 1.0.10

6
src/SemanticScuttle/Service/User.php
View file

@ -364,7 +364,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
public function getCurrentUserId() public function getCurrentUserId()
{ {
if (isset($_SESSION[$this->getSessionKey()])) { if (isset($_SESSION[$this->getSessionKey()])) {
return $_SESSION[$this->getSessionKey()]; return (int)$_SESSION[$this->getSessionKey()];
} else if (isset($_COOKIE[$this->getCookieKey()])) { } else if (isset($_COOKIE[$this->getCookieKey()])) {
$cook = explode(':', $_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)) { if ($row = $this->db->sql_fetchrow($dbresult)) {
$this->setCurrentUserId( $this->setCurrentUserId(
$row[$this->getFieldName('primary')] (int)$row[$this->getFieldName('primary')]
); );
$this->db->sql_freeresult($dbresult); $this->db->sql_freeresult($dbresult);
return $_SESSION[$this->getSessionKey()]; return (int)$_SESSION[$this->getSessionKey()];
} }
} }
return false; return false;