diff --git a/ChangeLog b/ChangeLog
index edeff1f69..2e36aafae 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/bookmark.lib.php: PHP 5.1.0-dev compatibility
+
 2005-10-18 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * footer.inc.php, index.php, server_databases.php, libraries/querywindow.js:
       fix problem not remembering selected server
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 9c8c5f253..395c05c43 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -60,7 +60,7 @@ function PMA_listBookmarks($db, $cfgBookmark)
 
     // There are some bookmarks -> store them
     // use the unique id as the key
-    if ($result > 0 && PMA_DBI_num_rows($result) > 0) {
+    if ($result && PMA_DBI_num_rows($result) > 0) {
         while ($row = PMA_DBI_fetch_row($result)) {
             $bookmark_list[$row[1]] = $row[0];
         } // end while