5 files changed, 13 insertions, 7 deletions
diff --git a/mod/categories/languages/en.php b/mod/categories/languages/en.php
index eaa65b13e..422fe81a4 100644
--- a/mod/categories/languages/en.php
+++ b/mod/categories/languages/en.php
@@ -9,7 +9,7 @@ $english = array(
 	'categories:explanation' => 'To set some predefined site-wide categories that will be used throughout your system, enter them below, separated with commas. Compatible tools will then display them when the user creates or edits content.',
 	'categories:save:success' => 'Site categories were successfully saved.',
 	'categories:results' => "Results for the site category: %s",
-	'categories:on_activate_reminder' => "Site-wide Cateogires won't work until you add categories. <a href=\"%s\">Add categories now.</a>",
+	'categories:on_activate_reminder' => "Site-wide Categories won't work until you add categories. <a href=\"%s\">Add categories now.</a>",
 );
 
 add_translation("en", $english);
 \ No newline at end of file
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index a2f4d97fc..4a6bd0864 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -9,7 +9,7 @@
 	<description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
 		<type>elgg_release</type>
 		<version>1.8</version>
diff --git a/mod/categories/pages/categories/listing.php b/mod/categories/pages/categories/listing.php
index 8924506e9..d51e6c19e 100644
--- a/mod/categories/pages/categories/listing.php
+++ b/mod/categories/pages/categories/listing.php
@@ -15,8 +15,8 @@ $type = get_input("type", 'object');
 $params = array(
 	'metadata_name' => 'universal_categories',
 	'metadata_value' => $category,
-	'types' => $type,
-	'subtypes' => $subtype,
+	'type' => $type,
+	'subtype' => $subtype,
 	'owner_guid' => $owner_guid,
 	'limit' => $limit,
 	'full_view' => FALSE,
diff --git a/mod/categories/start.php b/mod/categories/start.php
index b6bc4a55c..0aacf11e7 100644
--- a/mod/categories/start.php
+++ b/mod/categories/start.php
@@ -27,12 +27,12 @@ function categories_init() {
 
 
 /**
- * Page handler
- *
+ * Category page handler
+ * @return bool
  */
 function categories_page_handler() {
 	include(dirname(__FILE__) . "/pages/categories/listing.php");
-	return TRUE;
+	return true;
 }
 
 /**
diff --git a/mod/categories/views/default/input/categories.php b/mod/categories/views/default/input/categories.php
index 75960d257..b543cde45 100644
--- a/mod/categories/views/default/input/categories.php
+++ b/mod/categories/views/default/input/categories.php
@@ -10,6 +10,12 @@
 if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
 	$selected_categories = $vars['entity']->universal_categories;
 }
+
+// use sticky values if set
+if (isset($vars['universal_categories_list'])) {
+	$selected_categories = $vars['universal_categories_list'];
+}
+
 $categories = elgg_get_site_entity()->categories;
 if (empty($categories)) {
 	$categories = array();