more bug fixes
This commit is contained in:
parent
6866f7dd2d
commit
acf5457f6a
12 changed files with 142 additions and 56 deletions
|
|
@ -34,6 +34,14 @@
|
|||
- fix [ 1166071 ] Create New User allows blank username [mwilson]
|
||||
- fix [ 1166133 ] DataForm www_edit and www_editField's "proceed" [mwilson]
|
||||
- fix [ 1164211 ] DataForm export tab deliniated always contains.. [mwilson]
|
||||
- fix [ 1165616 ] calling a non-existent func= on a good url crashes Apache
|
||||
- fix [ 1154384 ] 6.2.11 Admins with default UI level
|
||||
- fix [ 1151879 ] Search button changes to "Please wait"
|
||||
- fix [ 1165645 ] Search not working
|
||||
- fix [ 1157233 ] search crashes
|
||||
- fix [ 1146359 ] certain templates still hardcoded
|
||||
- fix [ 1056470 ] Improper macro hangs calendar
|
||||
- fix [ 1120959 ] 5.5.x forms - export tab delimited
|
||||
|
||||
|
||||
6.5.2
|
||||
|
|
|
|||
|
|
@ -66,6 +66,8 @@ WebGUI::SQL->write("update asset set groupIdView='4' where className='WebGUI::As
|
|||
|
||||
WebGUI::SQL->write("update wobject set styleTemplateId='PBtmpl0000000000000060' where assetId='$templateFolder'");
|
||||
|
||||
#--------------------------------------------
|
||||
print "\tSetting up a new failsafe style\n" unless ($quiet);
|
||||
my $newFailSafe = '
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
|
|
@ -132,6 +134,20 @@ my $newFailSafe = '
|
|||
WebGUI::SQL->write("update template set template=".quote($newFailSafe)." where assetId='PBtmpl0000000000000060'");
|
||||
|
||||
|
||||
#--------------------------------------------
|
||||
print "\tMaking templates editable for files and images.\n" unless ($quiet);
|
||||
my $sth = WebGUI::SQL->read("select assetId,className from asset where className like 'WebGUI::Asset::File%'");
|
||||
while (my ($id, $class) = $sth->array) {
|
||||
my $template;
|
||||
if ($class =~ /Image/) {
|
||||
$template = 'PBtmpl0000000000000088';
|
||||
} else {
|
||||
$template = 'PBtmpl0000000000000024';
|
||||
}
|
||||
WebGUI::SQL->write("update FileAsset set templateId=".quote($template)." where assetId=".quote($id));
|
||||
}
|
||||
$sth->finish;
|
||||
|
||||
|
||||
WebGUI::Session::close();
|
||||
|
||||
|
|
|
|||
|
|
@ -28,4 +28,6 @@ update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if s
|
|||
update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if session.var.adminOn> \r\n <tmpl_var controls> \r\n</tmpl_if>\r\n\r\n<style type=\"text/css\">\r\n.forumHead {\r\n background-color: #eeeeee;\r\n border-bottom: 1px solid #cccccc;\r\n padding: 2px;\r\n padding-bottom: 4px;\r\n font-size: 13px;\r\n font-weight: bold;\r\n}\r\n.oddThread {\r\n font-size: 13px;\r\n border-bottom: 1px dashed #83cc83;\r\n padding-bottom: 4px;\r\n}\r\n.evenThread {\r\n font-size: 13px;\r\n border-bottom: 1px dashed #aaaaff;\r\n padding-bottom: 4px;\r\n}\r\n</style>\r\n\r\n\r\n<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description>\r\n</tmpl_if>\r\n\r\n<p>\r\n <tmpl_if user.canPost>\r\n <a href=\"<tmpl_var add.url>\"><tmpl_var add.label></a>\r\n •\r\n </tmpl_if>\r\n <tmpl_unless user.isVisitor>\r\n <tmpl_if user.isSubscribed>\r\n <a href=\"<tmpl_var unsubscribe.url>\"><tmpl_var unsubscribe.label></a>\r\n <tmpl_else>\r\n <a href=\"<tmpl_var subscribe.url>\"><tmpl_var subscribe.label></a>\r\n </tmpl_if>\r\n •\r\n </tmpl_unless>\r\n <a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\r\n</p>\r\n\r\n\r\n<table width=\"100%\">\r\n<tr>\r\n <tmpl_if user.isModerator>\r\n <td class=\"forumHead\"><tmpl_var status.label></td>\r\n </tmpl_if>\r\n <td class=\"forumHead\"><a href=\"<tmpl_var sortby.title.url>\"><tmpl_var title.label></a></td>\r\n <td class=\"forumHead\"><tmpl_var thumbnail.label></td>\r\n <td class=\"forumHead\"><a href=\"<tmpl_var sortby.date.url>\"><tmpl_var date.label></a></td>\r\n <td class=\"forumHead\"><a href=\"<tmpl_var sortby.username.url>\"><tmpl_var by.label></a></td>\r\n</tr>\r\n<tmpl_loop post_loop>\r\n <tr>\r\n <tmpl_if user.isModerator>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><tmpl_var status></td>\r\n </tmpl_if>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><a href=\"<tmpl_var url>\"><tmpl_var title></a><tmpl_if user.isPoster> (<tmpl_var status>)</tmpl_if></td>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\" style=\"text-align: center;\">\r\n <tmpl_if thumbnail>\r\n <a href=\"<tmpl_var url>\"><img src=\"<tmpl_var thumbnail>\" border=\"0\" alt=\"<tmpl_var title>\" /></a>\r\n <tmpl_else>\r\n \r\n </tmpl_if>\r\n </td>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><tmpl_var dateUpdated.human></td>\r\n <tmpl_if user.isVisitor>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><tmpl_var username></td>\r\n <tmpl_else>\r\n <td class=\"<tmpl_if __ODD__>oddThread<tmpl_else>evenThread</tmpl_if>\"><a href=\"<tmpl_var userProfile.url>\"><tmpl_var username></a></td>\r\n </tmpl_if>\r\n </tr>\r\n</tmpl_loop>\r\n</table>\r\n\r\n\r\n<tmpl_if pagination.pageCount.isMultiple>\r\n <div class=\"pagination\">\r\n <tmpl_var pagination.previousPage> · <tmpl_var pagination.pageList.upTo10> · <tmpl_var pagination.nextPage>\r\n </div>\r\n</tmpl_if>\r\n' where assetId='PBtmpl0000000000000097';
|
||||
update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if session.var.adminOn> \r\n <tmpl_var controls> \r\n</tmpl_if>\r\n\r\n\r\n<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description>\r\n</tmpl_if>\r\n\r\n<p>\r\n <tmpl_if user.canPost>\r\n <a href=\"<tmpl_var add.url>\">[<tmpl_var add.label>]</a>\r\n </tmpl_if>\r\n <tmpl_unless user.isVisitor>\r\n <tmpl_if user.isSubscribed>\r\n <a href=\"<tmpl_var unsubscribe.url>\">[<tmpl_var unsubscribe.label>]</a>\r\n <tmpl_else>\r\n <a href=\"<tmpl_var subscribe.url>\">[<tmpl_var subscribe.label>]</a>\r\n </tmpl_if>\r\n </tmpl_unless>\r\n <tmpl_if pagination.pageCount.isMultiple> \r\n <a href=\"<tmpl_var search.url>\">[<tmpl_var search.label>]</a>\r\n </tmpl_if>\r\n</p>\r\n\r\n<ul>\r\n <tmpl_loop post_loop>\r\n <li>\r\n <tmpl_if user.isPoster>\r\n <tmpl_unless session.var.adminOn>\r\n [<a href=\"<tmpl_var edit.url>\"><tmpl_var edit.label></a>]\r\n </tmpl_unless>\r\n </tmpl_if>\r\n <tmpl_if user.isModerator>\r\n <tmpl_if session.var.adminOn>\r\n <tmpl_var controls>\r\n <tmpl_else>\r\n <tmpl_unless user.isPoster>\r\n <tmpl_unless session.var.adminOn>\r\n [<a href=\"<tmpl_var edit.url>\"><tmpl_var edit.label></a>]\r\n </tmpl_unless>\r\n </tmpl_unless>\r\n </tmpl_if>\r\n (<a href=\"<tmpl_var url>\"><tmpl_var status></a>)\r\n </tmpl_if>\r\n <tmpl_if userDefined1><a href=\"<tmpl_var userDefined1>\" <tmpl_if userDefined2>target=\"_blank\"</tmpl_if>></tmpl_if><tmpl_var title><tmpl_if userDefined1></a></tmpl_if>\r\n <tmpl_if content>\r\n - <tmpl_var content>\r\n </tmpl_if>\r\n </li>\r\n </tmpl_loop>\r\n</ul>\r\n\r\n\r\n\r\n<tmpl_if pagination.pageCount.isMultiple>\r\n <div class=\"pagination\">\r\n <tmpl_var pagination.previousPage> · <tmpl_var pagination.pageList.upTo10> · <tmpl_var pagination.nextPage>\r\n </div>\r\n</tmpl_if>\r\n\r\n\r\n' where assetId='PBtmpl0000000000000082';
|
||||
update template set template='<a name=\"<tmpl_var assetId>\"></a> \r\n<tmpl_if session.var.adminOn> \r\n <p><tmpl_var controls></p> \r\n</tmpl_if>\r\n\r\n<tmpl_if displayTitle>\r\n <h1><tmpl_var title></h1>\r\n</tmpl_if>\r\n\r\n<tmpl_if description>\r\n <tmpl_var description>\r\n</tmpl_if>\r\n\r\n\r\n<p>\r\n <tmpl_if user.canPost>\r\n <a href=\"<tmpl_var add.url>\"><tmpl_var add.label></a>\r\n •\r\n </tmpl_if>\r\n <tmpl_unless user.isVisitor>\r\n <tmpl_if user.isSubscribed>\r\n <a href=\"<tmpl_var unsubscribe.url>\"><tmpl_var unsubscribe.label></a>\r\n <tmpl_else>\r\n <a href=\"<tmpl_var subscribe.url>\"><tmpl_var subscribe.label></a>\r\n </tmpl_if>\r\n •\r\n </tmpl_unless>\r\n <a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\r\n</p>\r\n\r\n<style type=\"text/css\">\r\n.weblogTitleBar {\r\n font-weight: bold;\r\n font-size: 14px;\r\n}\r\n.weblogLegend {\r\n font-size: 9px;\r\n color: #999999;\r\n}\r\n.weblogReadMore {\r\n text-align: right;\r\n font-size: 9px;\r\n width: 100%;\r\n}\r\n.weblogSynopsis {\r\n border: 1px solid #bbbbbb;\r\n font-size: 13px;\r\n padding: 5px;\r\n -moz-border-radius: 6px;\r\n}\r\n</style>\r\n\r\n<p />\r\n\r\n<tmpl_loop post_loop>\r\n <div class=\"weblogTitleBar\">\r\n <tmpl_var title> \r\n </div>\r\n <fieldset class=\"weblogSynopsis\">\r\n <legend class=\"weblogLegend\" align=\"left\">\r\n <tmpl_var by.label> <a href=\"<tmpl_var userProfile.url>\"><tmpl_var username></a> \r\n - \r\n <tmpl_var dateSubmitted.human>\r\n <tmpl_if replies>\r\n - <tmpl_var replies> <tmpl_var replies.label>\r\n </tmpl_if>\r\n <tmpl_if user.isPoster>\r\n - <tmpl_var status>\r\n <tmpl_else>\r\n <tmpl_if user.isModerator>\r\n - <tmpl_var status>\r\n </tmpl_if>\r\n </tmpl_if>\r\n </legend>\r\n <tmpl_if thumbnail>\r\n <a href=\"<tmpl_var url>\"><img src=\"<tmpl_var thumbnail>\" border=\"0\" alt=\"<tmpl_var title>\" align=\"right\" /></a>\r\n </tmpl_if>\r\n <tmpl_var synopsis>\r\n <div class=\"weblogReadMore\">\r\n <a href=\"<tmpl_var url>\"><tmpl_var readmore.label></a>\r\n </div>\r\n </fieldset>\r\n <p />\r\n</tmpl_loop> \r\n\r\n \r\n\r\n<tmpl_if pagination.pageCount.isMultiple>\r\n <div class=\"pagination\">\r\n <tmpl_var pagination.previousPage> · <tmpl_var pagination.pageList.upTo10> · <tmpl_var pagination.nextPage>\r\n </div>\r\n</tmpl_if>\r\n\r\n ' where assetId='PBtmpl0000000000000112';
|
||||
alter table FileAsset add column templateId varchar(22) not null;
|
||||
alter table snippet add column processAsTemplate int not null default 0;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue