diff --git a/docs/upgrades/upgrade_5.2.4-5.3.0.sql b/docs/upgrades/upgrade_5.2.4-5.3.0.sql
index 1b0a52462..c4735416c 100644
--- a/docs/upgrades/upgrade_5.2.4-5.3.0.sql
+++ b/docs/upgrades/upgrade_5.2.4-5.3.0.sql
@@ -10,7 +10,13 @@ delete from international where languageId=1 and namespace='Article' and interna
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (71,1,'Article','Articles are the Swiss Army knife of WebGUI. Most pieces of static content can be added via the Article.\r\n
\r\n\r\nNOTE: You can create a multi-paged article by placing the seperator macro (^-;) at various places through-out your article.\r\n\r\n\r\nTemplate
\r\nSelect a template to layout your article.\r\n\r\n\r\nImage
\r\nChoose an image (.jpg, .gif, .png) file from your hard drive. This file will be uploaded to the server and displayed in your article.\r\n
\r\n\r\n\r\nAttachment
\r\nIf you wish to attach a word processor file, a zip file, or any other file for download by your users, then choose it from your hard drive.\r\n
\r\n\r\nLink Title
\r\nIf you wish to add a link to your article, enter the title of the link in this field. \r\n
\r\nExample: Google\r\n
\r\n\r\nLink URL
\r\nIf you added a link title, now add the URL (uniform resource locator) here. \r\n
\r\nExample: http://www.google.com\r\n\r\n
\r\n\r\nConvert carriage returns?
\r\nIf you\'re publishing HTML there\'s generally no need to check this option, but if you aren\'t using HTML and you want a carriage return every place you hit your "Enter" key, then check this option.\r\n\r\n\r\nAllow discussion?
\r\nChecking this box will enable responses to your article much like Articles on Slashdot.org.\r\n
\r\n\r\n\r\nFilter Post
\r\nSelect the level of content filtering you wish to perform on all discussion posts.\r\n
\r\n\r\nWho can post?
\r\nSelect the group that is allowed to post to this discussion.\r\n
\r\n\r\nEdit Timeout
\r\nHow long should a user be able to edit their post before editing is locked to them?\r\n
\r\nNOTE: Don\'t set this limit too high. One of the great things about discussions is that they are an accurate record of who said what. If you allow editing for a long time, then a user has a chance to go back and change his/her mind a long time after the original statement was made.\r\n
\r\n\r\nKarma Per Post
\r\nHow much karma should be given to a user when they post to this discussion?\r\n
\r\n\r\nWho can moderate?
\r\nSelect the group that is allowed to moderate this discussion.\r\n
\r\n\r\nModeration Type?
\r\nYou can select what type of moderation you\'d like for your users. After-the-fact means that when a user posts a message it is displayed publically right away. Pre-emptive means that a moderator must preview and approve users posts before allowing them to be publically visible. Alerts for new posts will automatically show up in the moderator\'s WebGUI Inbox.\r\n
\r\nNOTE: In both types of moderation the moderator can always edit or delete the messages posted by your users.\r\n
\r\n\r\nAdd edit stamp to posts?
\r\nDo you wish to "stamp" all edits so that you can track who edited a post and when?\r\n
', 1050146714);
delete from international where languageId=1 and namespace='Article' and internationalId=73;
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (73,1,'Article','The following template variables are available for article templates.\r\n
\r\n\r\nattachment.box
\r\nOutputs a standard WebGUI attachment box including icon, filename, and attachment indicator.\r\n\r\n\r\nattachment.icon
\r\nThe URL to the icon image for this attachment type.\r\n\r\n\r\nattachment.name
\r\nThe filename for this attachment.\r\n\r\n\r\nattachment.url
\r\nThe URL to download this attachment.\r\n\r\n\r\nimage.thumbnail
\r\nThe URL to the thumbnail for the attached image.\r\n\r\n\r\nimage.url
\r\nThe URL to the attached image.\r\n\r\n\r\npost.label
\r\nThe translated label to add a comment to this article.\r\n\r\n\r\n\r\npost.URL
\r\nThe URL to add a comment to this article.\r\n\r\n\r\nreplies.count
\r\nThe number of comments attached to this article.\r\n\r\n\r\nreplies.label
\r\nThe translated text indicating that you can view the replies.\r\n\r\n\r\nreplies.url
\r\nThe URL to view the replies to this article.\r\n\r\n\r\n\r\nfirstPage
\r\nA link to the first page in the paginator.\r\n\r\n\r\nlastPage
\r\nA link to the last page in the paginator.\r\n\r\n\r\nnextPage
\r\nA link to the next page forward in the paginator.\r\n\r\n\r\npreviousPage
\r\nA link to the next page backward in the paginator.\r\n\r\n\r\npageList
\r\nA list of links to all the pages in the paginator.\r\n\r\n\r\nmultiplePages
\r\nA conditional indicating whether there is more than one page in the paginator.\r\n\r\n\r\nisFirstPage
\r\nA conditional indicating whether the visitor is viewing the first page.\r\n\r\n\r\nisLastPage
\r\nA conditional indicating whether the visitor is viewing the last page.\r\n\r\n\r\n', 1050146621);
-
+delete from international where languageId=1 and namespace='LinkList' and internationalId=76;
+insert into international (internationalId,languageId,namespace,message,lastUpdated) values (76,1,'LinkList','The following is the list of template variables available in Link List templates.\r\n\r\n\r\n\r\naddlink.url
\r\nThe URL to add a link to this link list.\r\n\r\n\r\naddlink.label
\r\nThe translated label for the add link URL.\r\n\r\n\r\ncanEdit
\r\nA condition indicating whether the user can edit the links.\r\n\r\n\r\n\r\nlink_loop
\r\nThis loop contains all of the information about each link.\r\n\r\n\r\nlink.url
\r\nThe URL for this link.\r\n\r\n\r\nlink.name
\r\nThe text to be linked.\r\n\r\n\r\nlink.controls
\r\nThe WebGUI management controls for this link.\r\n\r\n\r\nlink.newwindow
\r\nA conditional as to whether the link should be opened in a new window.\r\n\r\n\r\nlink.description
\r\nThe description of this link.\r\n\r\n\r\n
\r\n\r\n', 1050158350);
+delete from template where namespace='LinkList' and templateId<10;
+INSERT INTO template VALUES (4,'Descriptive','\r\n
\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n \">\r\n\r\n\r\n\r\n \r\n
\r\n \r\n\r\n \"\r\n \r\n target=\"_blank\"\r\n \r\n >\r\n\r\n \r\n - \r\n \r\n \r\n\r\n','LinkList');
+INSERT INTO template VALUES (3,'Ordered List','\r\n
\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n \">\r\n\r\n\r\n\r\n\r\n - \r\n \r\n \r\n \r\n\r\n \"\r\n \r\n target=\"_blank\"\r\n \r\n >\r\n\r\n \r\n - \r\n \r\n
\r\n\r\n
','LinkList');
+INSERT INTO template VALUES (1,'Default Link List','\r\n
\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n \">\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n \r\n ·\r\n \"\r\n \r\n target=\"_blank\"\r\n \r\n >\r\n\r\n \r\n - \r\n \r\n
\r\n\r\n','LinkList');
+INSERT INTO template VALUES (2,'Unordered List','\r\n
\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n \">\r\n\r\n\r\n\r\n\r\n- \r\n \r\n \r\n \r\n \r\n \"\r\n \r\n target=\"_blank\"\r\n \r\n >\r\n\r\n \r\n - \r\n \r\n
\r\n\r\n','LinkList');
diff --git a/lib/WebGUI/Wobject/LinkList.pm b/lib/WebGUI/Wobject/LinkList.pm
index ff2f8cafc..a62efebb2 100644
--- a/lib/WebGUI/Wobject/LinkList.pm
+++ b/lib/WebGUI/Wobject/LinkList.pm
@@ -192,6 +192,7 @@ sub www_view {
my (%var, @linkloop, $controls, $link, $sth);
$var{"addlink.url"} = WebGUI::URL::page('func=editLink&lid=new&wid='.$_[0]->get("wobjectId"));
$var{"addlink.label"} = WebGUI::International::get(13,$_[0]->get("namespace"));
+ $var{canEdit} = WebGUI::Privilege::canEditPage();
$sth = WebGUI::SQL->read("select * from LinkList_link where wobjectId=".$_[0]->get("wobjectId")."
order by sequenceNumber");
while ($link = $sth->hashRef) {