X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fpage.ml;h=67ac47c3589889e5e831dc460393b19c4984b1cb;hb=6ad484dd47c27fd54c2f26fb931ba125bae9abc6;hp=bf3fd300cc21e338d94ab269f59d4e53503b485c;hpb=529b55fe61e017417faae092fe221bbd41368aa5;p=cocanwiki.git diff --git a/scripts/page.ml b/scripts/page.ml index bf3fd30..67ac47c 100644 --- a/scripts/page.ml +++ b/scripts/page.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: page.ml,v 1.36 2004/10/23 15:00:15 rich Exp $ + * $Id: page.ml,v 1.37 2004/10/30 10:16:10 rich Exp $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -268,14 +268,14 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid (match user with Anonymous -> t#conditional "user_logged_in" false - | User (_, username, _) -> + | User (_, username, _, _) -> t#conditional "user_logged_in" true; t#set "username" username); (* If logged in, we want to update the recently_visited table. *) if pageid <> None then ( match user with - | User (userid, _, _) -> + | User (userid, _, _, _) -> let sth = dbh#prepare_cached "delete from recently_visited where hostid = ? and userid = ? and url = ?" in @@ -299,7 +299,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid let rv = match user with - | User (userid, _, _) -> + | User (userid, _, _, _) -> (* Recently visited URLs, but don't repeat any from the 'what * links here' section, and don't link to self. *)