aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2014-01-13 00:54:26 +0100
committerSem <sembrestels@riseup.net>2014-01-13 00:54:26 +0100
commitae76fa880c7aeb7f7b0846dd4b109be8d398018c (patch)
treeabf4431be912c5d0b3ce1b3ed0a0fd39b779cb80
parentb632de668ebec56467060362af7ddd099d8eb8a4 (diff)
parent312877b25ef888868de1c0116d94d0a211e44b00 (diff)
downloadelgg-ae76fa880c7aeb7f7b0846dd4b109be8d398018c.tar.gz
elgg-ae76fa880c7aeb7f7b0846dd4b109be8d398018c.tar.bz2
Merge branch 'hotfix/1.8.1.1' into develop
-rw-r--r--actions/simplepie/save_group_feed.php2
-rw-r--r--manifest.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/actions/simplepie/save_group_feed.php b/actions/simplepie/save_group_feed.php
index 830861612..8dc2ffd78 100644
--- a/actions/simplepie/save_group_feed.php
+++ b/actions/simplepie/save_group_feed.php
@@ -8,7 +8,7 @@ if (!simplepie_is_url($feed_url)) {
forward(REFERER);
}
-if (!elgg_instanceof($group, 'group') || !group->canEdit()) {
+if (!elgg_instanceof($group, 'group') || !$group->canEdit()) {
forward(REFERER);
}
$group->feed_url = $feed_url;
diff --git a/manifest.xml b/manifest.xml
index 8be1bc335..eff9681d2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
<name>SimplePie RSS Feed Integration</name>
<author>Cash Costello</author>
- <version>1.8.1</version>
+ <version>1.8.1.1</version>
<category>widget</category>
<description>Provides a widget that pulls in RSS feeds</description>
<website>http://www.cashcostello.com/</website>