X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fcocanwiki_diff.ml;h=97f4b65948bddf6c823fa53d7c051be4c0e05dce;hb=d513396938a8682bf1a9971c752c425587198ef9;hp=8bfd4af7a1d15e4f4da4e5c2df2fa4f08bbe219a;hpb=11b93485a29771f4d826c50d9efc6d3607dfa50f;p=cocanwiki.git diff --git a/scripts/cocanwiki_diff.ml b/scripts/cocanwiki_diff.ml index 8bfd4af..97f4b65 100644 --- a/scripts/cocanwiki_diff.ml +++ b/scripts/cocanwiki_diff.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: cocanwiki_diff.ml,v 1.3 2004/09/09 12:21:22 rich Exp $ + * $Id: cocanwiki_diff.ml,v 1.4 2004/09/20 10:56:47 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 @@ -59,7 +59,7 @@ let get_version_for_diff (dbh : Dbi.connection) version = let css = sth#fetch1string () in - let sth = dbh#prepare_cached "select sectionname, content + let sth = dbh#prepare_cached "select coalesce (sectionname, ''), content from contents where pageid = ? order by ordering" in sth#execute [`Int version];