diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c9046e8c5..aab083128 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,9 @@
7.0.1
- fix: User profile field "Department" needs i18n
+ - fix: AssetProxied Navigation context menu - items invisible in Style 02
+ - fix: Request Tracker Asset - Reply to a post displays Severity drop down
+ list
+ - fix: Syndicated wobject erro 6.8+
- fix: new spectre.pl error (Martin Kamerbeek / Procolix)
7.0.0
diff --git a/docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl b/docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl
new file mode 100644
index 000000000..964bde924
--- /dev/null
+++ b/docs/upgrades/templates-7.0.1/request_tracker_post_form.tmpl
@@ -0,0 +1,117 @@
+#PBtmpl0000000000000210
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
+
+ |
+ |
+
+
+
+ |
+
+
+ |
+
+
+
+ |
+ |
+
+
+
+ |
+ |
+
+
+
+
+
+ |
+ |
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+ |
+ |
+
+
+ |
+ |
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+
+
+~~~
+
+
+
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index c655808f3..1f5d14e19 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -965,6 +965,7 @@ sub www_edit {
});
} elsif ($self->session->form->process("class","className") eq "WebGUI::Asset::Post::Thread") { # new thread
return $self->session->privilege->insufficient() unless ($self->getThread->getParent->canPost);
+ $var{isThread} = 1;
$var{isNewThread} = 1;
if ($self->getThread->getParent->canEdit) {
$var{'sticky.form'} = WebGUI::Form::yesNo($self->session, {
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index 8e11183cd..64d8224ee 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -274,7 +274,6 @@ sub _normalize_items {
sub _get_rss_data {
my $session = shift;
my $url = shift;
-
my $cache = WebGUI::Cache->new($session,'url:' . $url, 'RSS');
my $rss_serial = $cache->get;
my $rss = {};
@@ -473,7 +472,6 @@ sub _get_items {
my $self = shift;
my $urls = shift;
my $maxHeadlines = shift || $self->getValue('maxHeadlines');
-
my $displayMode=$self->getValue('displayMode');
my $hasTermsRegex=_make_regex($self->getValue('hasTerms'));
@@ -488,12 +486,18 @@ sub _get_items {
for my $url (@{$urls}) {
my $rss_info=_get_rss_data($self->session,$url);
- push(@rss_feeds, $rss_info) if($rss_info);
+ push(@rss_feeds, $rss_info) if(defined $rss_info);
}
+ # deal with the fact that we may never get valid data
+
+ if (scalar(@rss_feeds) < 1) {
+ return ({}, []);
+ }
+
#Sort feeds in order by channel title.
#@rss_feeds=sort{$a->{channel}->{title} cmp $b->{channel}->{title}} @rss_feeds;
-
+
if ($displayMode eq 'grouped') {
_create_grouped_items($items,\@rss_feeds,$maxHeadlines,$hasTermsRegex);
} else {
@@ -578,6 +582,11 @@ sub view {
my %var;
my($item_loop,$rss_feeds)=$self->_get_items(\@validatedUrls, $maxHeadlines);
+
+ if (scalar(@$rss_feeds) < 1) {
+ return $self->processTemplate(\%var,undef,$self->{_viewTemplate});
+ }
+
if(@$rss_feeds > 1){
#If there is more than one (valid) feed in this wobject, put in the wobject description info.
$var{'channel.title'} = $title;
diff --git a/www/extras/contextMenu/contextMenu.js b/www/extras/contextMenu/contextMenu.js
index aea8a5d5a..9892fff89 100755
--- a/www/extras/contextMenu/contextMenu.js
+++ b/www/extras/contextMenu/contextMenu.js
@@ -75,7 +75,7 @@ function contextMenu_draw(){
var output = "";
output += '';
if (this.type == "image") {