diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index d28d5e376..9807bd8f1 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -36,6 +36,13 @@ 7.3.19 - Fixed a formatting problem in the workflow editor screen. + - fix: bad javascript string escaping in EMS + - fix: Unable to upload images or edit listings for Matrix + - fix: recent changes limit in wiki master front page + - fix: old recurring events were not deleted when changing recurrence pattern + - fix: unable to remove recurrence on events + - fix: Show edit links on EMS search view without being in Admin group + - fix: Fixed a typo in the Article with attachments template (perlDreamer Consulting, LLC) 7.3.18 diff --git a/docs/install.txt b/docs/install.txt index 699999565..d89561dc7 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -6,7 +6,7 @@ The following is a rough overview of how to install WebGUI. For more detailed instructions read the WebGUI installation documentation. - http://www.plainblack.com/webgui/install + http://wiki.webgui.org/installation-options QnD INSTALL INSTRUCTIONS: diff --git a/lib/WebGUI/Asset/Wobject/WikiMaster.pm b/lib/WebGUI/Asset/Wobject/WikiMaster.pm index 794011cf7..b4ea2a222 100644 --- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm +++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm @@ -41,7 +41,8 @@ sub appendRecentChanges { my $var = shift; my $limit = shift || $self->get("recentChangesCount") || 50; my $rs = $self->session->db->read("select asset.assetId, revisionDate from assetData left join asset on assetData.assetId=asset.assetId where - lineage like ? and lineage<>? and status='approved' order by revisionDate desc limit ?", [$self->get("lineage").'%', $self->get("lineage"), $self->get("recentChangesCount")]); + lineage like ? and lineage<>? and status='approved' order by revisionDate desc limit ?", + [$self->get("lineage").'%', $self->get("lineage"), $limit]); while (my ($id, $version) = $rs->array) { my $asset = WebGUI::Asset->new($self->session, $id, "WebGUI::Asset::WikiPage", $version); my $user = WebGUI::User->new($self->session, $asset->get("actionTakenBy"));