Merge branch 'master' of github.com:brettp/Elgg

6 files changed, 11 insertions, 10 deletions

diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
index feb986b27..5a945e8eb 100644
--- a/actions/admin/plugins/activate.php
+++ b/actions/admin/plugins/activate.php
@@ -44,7 +44,8 @@ if (count($activated_guids) === 1) {
 	if ($query) {
 		$url .= "?$query";
 	}
-	forward($url . '#elgg-plugin-' . $plugin_guids[0]);
+	$plugin = get_entity($plugin_guids[0]);
+	forward("$url#{$plugin->getID()}");
 } else {
 	forward(REFERER);
 }
\ No newline at end of file
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index 6c9a55c15..f5eca3aaa 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -43,7 +43,8 @@ if (count($plugin_guids) == 1) {
 	if ($query) {
 		$url .= "?$query";
 	}
-	forward($url . '#elgg-plugin-' . $plugin_guids[0]);
+	$plugin = get_entity($plugin_guids[0]);
+	forward("$url#{$plugin->getID()}");
 } else {
 	forward(REFERER);
 }
diff --git a/actions/admin/plugins/set_priority.php b/actions/admin/plugins/set_priority.php
index 702aae91b..1f8bc24af 100644
--- a/actions/admin/plugins/set_priority.php
+++ b/actions/admin/plugins/set_priority.php
@@ -6,9 +6,8 @@
  * overriding as well as the order of view extensions.  Plugins with higher
  * priority are loaded after and override plugins with lower priorities.
  *
- * NOTE: When viewing the admin page (advanced plugin admin in >= 1.8) plugins
- * LOWER on the page have HIGHER priority and will override views, etc
- * from plugins above them.
+ * NOTE: When viewing the plugin admin page, plugins LOWER on the page
+ * have HIGHER priority and will override views, etc from plugins above them.
  *
  * @package Elgg.Core
  * @subpackage Administration.Plugins
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
index e21aa49c8..19976ea87 100644
--- a/actions/avatar/upload.php
+++ b/actions/avatar/upload.php
@@ -17,7 +17,7 @@ $icon_sizes = array(
 	'tiny' => array('w'=>25, 'h'=>25, 'square'=>TRUE, 'upscale'=>TRUE),
 	'small' => array('w'=>40, 'h'=>40, 'square'=>TRUE, 'upscale'=>TRUE),
 	'medium' => array('w'=>100, 'h'=>100, 'square'=>TRUE, 'upscale'=>TRUE),
-	'large' => array('w'=>200, 'h'=>200, 'square'=>FALSE, 'upscale'=>FALSE),
+	'large' => array('w'=>200, 'h'=>200, 'square'=>FALSE, 'upscale'=>TRUE),
 	'master' => array('w'=>550, 'h'=>550, 'square'=>FALSE, 'upscale'=>FALSE)
 );
 
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index 3b5694039..e94127f7c 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -26,8 +26,8 @@ $plugin_name = $plugin->getManifest()->getName();
 $result = false;
 
 // allow a plugin to override the save action for their settings
-if (elgg_action_exists("settings/$plugin_id/save")) {
-	action("settings/$plugin_id/save");
+if (elgg_action_exists("$plugin_id/settings/save")) {
+	action("$plugin_id/settings/save");
 } else {
 	foreach ($params as $k => $v) {
 		$result = $plugin->setSetting($k, $v);
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index c6214f68d..71ad2ad7b 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -39,8 +39,8 @@ if (!$user->canEdit()) {
 
 $result = false;
 
-if (elgg_action_exists("usersettings/$plugin_id/save")) {
-	action("usersettings/$plugin_id/save");
+if (elgg_action_exists("$plugin_id/usersettings/save")) {
+	action("$plugin_id/usersettings/save");
 } else {
 	foreach ($params as $k => $v) {
 		// Save