diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index f93e28a9f..9ea15a6ef 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -7,6 +7,7 @@ - Added asset type icons to the asset toolbar. - Added isAdminOn(), switchOnAdmin(), and switchOffAdmin() to WebGUI::Session to eliminate all of the previously cryptic means of doing those things. + - Added a temporary file storage mechanism to WebGUI::Storage. - Fixed resetting votes on Poll would crash it. - Fixed not being able to set display title and other yes no questions to no. - Fixed a bug where URLs would become unreachable when using SSL. @@ -31,6 +32,7 @@ - bugfix [ 1150173 ] Error message when logging out - bugfix [ 1154247 ] Title and menuTitle set to 'untitled' if url is changed - bugfix [ 1150982 ] Subscribe to forum thread causes error + - bugfix [ 1151216 ] The Latest News is blank on demo.plainblack.com 6.3.0 @@ -107,6 +109,8 @@ - fix [ 1052801 ] wobjectproxy throws security error on editSubmission - fix [ 1028921 ] Cannot drag n drop proxy wobjects - fix [ 1003509 ] Admin mode breaks page layout with users not in Admin Group + - fix [ 1123666 ] Discussion - reply to thread not displaying in threaded + mode - Removed the page stats tracking function as it was killing people's sites. We recommend AWStats instead (www.awstats.org) - Added the ability to switch the style for user functions like profiles, diff --git a/docs/previousVersion.sql b/docs/previousVersion.sql index 1fccc4254..751dbe362 100644 --- a/docs/previousVersion.sql +++ b/docs/previousVersion.sql @@ -2006,7 +2006,7 @@ CREATE TABLE SyndicatedContent ( -- -INSERT INTO SyndicatedContent VALUES ('http://www.plainblack.com/news?wid=920&func=viewRSS',3,'fK-HMSboA3uu0c1KYkYspA','GNvjCFQWjY2AF2uf0aCM8Q'); +INSERT INTO SyndicatedContent VALUES ('http://www.plainblack.com/news/news?func=viewRSS',3,'fK-HMSboA3uu0c1KYkYspA','GNvjCFQWjY2AF2uf0aCM8Q'); -- -- Table structure for table `Thread` diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 2ec61d1b4..f4dad9ffc 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -1031,16 +1031,16 @@ sub www_viewRSS { ~; my $sth = WebGUI::SQL->read("select * from Thread - left join asset on Thread.assetId=asset.parentId + left join asset on Thread.assetId=asset.assetId left join Post on Post.assetId=asset.assetId where asset.parentId=".quote($self->getId)." and asset.state='published' and asset.className='WebGUI::Asset::Post::Thread' and Post.status='approved' order by ".$self->getValue("sortBy")." ".$self->getValue("sortOrder")); my $i = 1; - while (my $data = $sth->hashref) { - my $post = WebGUI::Asset::Post::Thread->newByPropertyHashRef($data); + while (my $data = $sth->hashRef) { + my $post = WebGUI::Asset::Wobject::Collaboration->newByPropertyHashRef($data); - my $encUrl = _xml_encode($post->getUrl); + my $encUrl = _xml_encode(WebGUI::URL::getSiteURL().$post->getUrl); my $encTitle = _xml_encode($post->get("title")); my $encPubDate = _xml_encode(_get_rfc822_date($post->get("dateUpdated"))); my $encDescription = _xml_encode($self->get("synopsis")); diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm index 010458d20..9596b9dbe 100644 --- a/lib/WebGUI/Storage.pm +++ b/lib/WebGUI/Storage.pm @@ -320,6 +320,23 @@ sub create { $self->_makePath; return $self; } +#------------------------------------------------------------------- + +=head2 createTemp ( ) + +Creates a temporary storage location on the file system. + +=cut + +sub createTemp { + my $class = shift; + my $id = WebGUI::Id::generate(); + $id =~ m/^(.{2})/; + my $self = {_id => $id, _part1 => 'temp', _part2 => $1}; + bless $self, ref($class)||$class; + $self->_makePath; + return $self; +} #-------------------------------------------------------------------