Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/bookmarks/bookmarks.info	9 Sep 2013 11:20:55 -0000	1.27
+++ openacs-4/packages/bookmarks/bookmarks.info	18 Apr 2014 06:49:48 -0000	1.28
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.0d3" url="http://openacs.org/repository/download/apm/bookmarks-5.0d3.apm">
+    <version name="5.1" url="http://openacs.org/repository/download/apm/bookmarks-5.1.apm">
         <owner url="http://petermarklund.com">Peter Marklund</owner>
         <summary>Web based user bookmark application.</summary>
         <release-date>2002-10-27</release-date>
@@ -27,7 +27,7 @@
 &lt;/ul&gt;
 </description>
 
-        <provides url="bookmarks" version="5.0d3"/>
+        <provides url="bookmarks" version="5.1"/>
         <requires url="acs-kernel" version="5.0d13"/>
 
         <callbacks>
Index: openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	18 Apr 2014 06:45:02 -0000	1.8
+++ openacs-4/packages/bookmarks/tcl/bookmarks-procs.tcl	18 Apr 2014 06:49:49 -0000	1.9
@@ -67,7 +67,7 @@
                                           from   bm_bookmarks 
 	                                  where  bookmark_id = :bookmark_id"]
 	
-	if {$dbclick_p == "1"} {   
+	if {$dbclick_p == 1} {   
 	    ad_returnredirect  -allow_complete_url $return_url
             ad_script_abort
 	} else {
Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	18 Apr 2014 06:38:29 -0000	1.10
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	18 Apr 2014 06:49:49 -0000	1.11
@@ -61,7 +61,7 @@
 
 # Redirect the user to log in if he has not done so
 set user_id [ad_conn user_id]
-if { $user_id == "0" } {
+if { $user_id == 0 } {
     ad_returnredirect "/register/?return_url=$this_url_urlenc"
     ad_script_abort
 }
Index: openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl	18 Apr 2014 06:38:29 -0000	1.7
+++ openacs-4/packages/bookmarks/www/bookmark-add-one-2.tcl	18 Apr 2014 06:49:49 -0000	1.8
@@ -46,7 +46,7 @@
 
 set creation_ip [ad_conn peeraddr]
 
-if {$n_complete_urls == "0"} {
+if {$n_complete_urls == 0} {
    
         set url_id [db_nextval acs_object_id_seq]
 
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	18 Apr 2014 06:38:29 -0000	1.9
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	18 Apr 2014 06:49:49 -0000	1.10
@@ -108,7 +108,7 @@
 set this_url_urlenc [ad_urlencode "[ad_conn url]?[export_vars -url {viewed_user_id complete_url local_title return_url bookmark_id}]"]
 
 set user_id [ad_conn user_id]
-if { $user_id == "0" } {
+if { $user_id == 0 } {
     ad_returnredirect "/register/?return_url=$this_url_urlenc"
     ad_script_abort
 }
Index: openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl	18 Apr 2014 06:38:29 -0000	1.5
+++ openacs-4/packages/bookmarks/www/bookmark-edit-2.tcl	18 Apr 2014 06:49:49 -0000	1.6
@@ -25,7 +25,7 @@
     old_private_p
 } -validate {
     valid_url {
-	if { $folder_p == "f" && [empty_string_p [string trim $complete_url]] } {
+	if { $folder_p == "f" && [string trim $complete_url] eq "" } {
 	    ad_complain "You must provide a non empty url"
 	}
     }
Index: openacs-4/packages/bookmarks/www/bookmark-header.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/bookmark-header.tcl	18 Apr 2014 06:38:29 -0000	1.5
+++ openacs-4/packages/bookmarks/www/bookmark-header.tcl	18 Apr 2014 06:49:49 -0000	1.6
@@ -18,7 +18,7 @@
 
 } -validate {
     valid_user_id -requires {viewed_user_id:integerl} {
-	if { [empty_string_p [db_string user_exists "select 1 from parties where party_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""]] } {
+	if { [db_string user_exists "select 1 from parties where party_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""] eq "" } {
 	    ad_complain "The user_id in the url is invalid"
 	}
     }
Index: openacs-4/packages/bookmarks/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/bookmarks/www/index.tcl	18 Apr 2014 06:38:29 -0000	1.11
+++ openacs-4/packages/bookmarks/www/index.tcl	18 Apr 2014 06:49:49 -0000	1.12
@@ -18,7 +18,7 @@
 
 } -validate {
     valid_user_id -requires {viewed_user_id:integerl} {
-	if { [empty_string_p [db_string user_exists "select 1 from parties where party_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""]] } {
+	if { [db_string user_exists "select 1 from parties where party_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""] eq "" } {
 	    ad_complain "The user_id in the url is invalid"
 	}
     }