fix(tags): Corrected cases of tags having leading or trailing spaces.

Metastrings for annotation and metadata name and values are again trimmed before saving.

Fixes #8123

docs/admin/upgrading.rst

@@ -21,7 +21,7 @@ Advice
 Basic instructions
 ==================
 
-#. **Back up your database, data directory and code**
+#. **Back up your database, data directory, and code**
 #. Download the new version of Elgg from http://elgg.org
 #. Update the files
     * If doing a patch upgrade (1.9.x), overwrite your existing files with the new version of Elgg
@@ -37,9 +37,17 @@ Basic instructions
    Any modifications should have been written within plugins, so that they are not lost on overwriting.
    If this is not the case, take care to maintain your modifications. 
 
-.. note::
+From 1.10 to 1.11
+========================
 
-   If you modified the default .htaccess, be sure to port your modifications over to the new one.
+Breaking changes
+----------------
+In versions 1.9 and 1.10, names and values for metadata and annotations were not correctly trimmed
+for whitespace. Elgg 1.11 correctly trims these strings and updates the database to correct
+existing strings. If your plugin uses metadata or annotations with leading or trailing whitespace,
+you will need to update the plugin to trim the names and values. This is especially important if
+you are using custom SQL clauses or have hard-coded metastring IDs, since the update might change
+metastring IDs.
 
 From 1.8 to 1.9
 ===============

engine/classes/Elgg/Database/Annotations.php

@@ -71,7 +71,6 @@ function create($entity_guid, $name, $value, $value_type = '', $owner_guid = 0,
 		$result = false;
 
 		$entity_guid = (int)$entity_guid;
-		$name = trim($name);
 		$value_type = detect_extender_valuetype($value, $value_type);
 
 		$owner_guid = (int)$owner_guid;

engine/classes/Elgg/Database/MetastringsTable.php

@@ -114,7 +114,7 @@ private function getIdCaseInsensitive($string) {
 	 * @return int The identifier for this string
 	 */
 	function add($string) {
-		$escaped_string = $this->db->sanitizeString($string);
+		$escaped_string = $this->db->sanitizeString(trim($string));
 
 		return $this->db->insertData("INSERT INTO {$this->getTableName()} (string) VALUES ('$escaped_string')");
 	}

engine/lib/upgrades/2015041400-1.11.0_dev-trim_metastrings-d9a9fdfa28a981a3.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg 1.11.0-dev upgrade 2015041400
+ * trim_metastrings
+ *
+ * Trim all whitespace padding in metastrings
+ */
+
+$prefix = elgg_get_config('dbprefix');
+$q = "SELECT * FROM {$prefix}metastrings WHERE string REXEXP '^[ ]+|[ ]+$'";
+$r = mysql_query($q);
+
+while ($ms = mysql_fetch_assoc($r)) {
+	// find if trimmed version collides with existing MS
+	$string = sanitize_string(trim($ms['string']));
+	$existing = get_data_row("SELECT * FROM {$prefix}metastrings WHERE string = BINARY '$string' LIMIT 1");
+
+	if ($existing) {
+		// delete the padded string and update MD / annotations to use the existing trimmed one
+		$q = "DELETE FROM {$prefix}metastrings WHERE id = {$ms['id']} LIMIT 1";
+		if (delete_data($q)) {
+			update_data("UPDATE {$prefix}metadata SET name_id = '{$existing->id}' where name_id = '{$ms['id']}'");
+			update_data("UPDATE {$prefix}metadata SET value_id = '{$existing->id}' where value_id = '{$ms['id']}'");
+
+			update_data("UPDATE {$prefix}annotations SET name_id = '{$existing->id}' where name_id = '{$ms['id']}'");
+			update_data("UPDATE {$prefix}annotations SET value_id = '{$existing->id}' where value_id = '{$ms['id']}'");
+		}
+	} else {
+		update_data("UPDATE {$prefix}metastrings SET string = '$string' where id = '{$ms['id']}'");
+	}
+}

mod/groups/actions/discussion/save.php

@@ -50,8 +50,7 @@
 $topic->access_id = $access_id;
 $topic->container_guid = $container_guid;
 
-$tags = explode(",", $tags);
-$topic->tags = $tags;
+$topic->tags = string_to_tag_array($tags);
 
 $result = $topic->save();
 

version.php

@@ -11,7 +11,7 @@
 
 // YYYYMMDD = Elgg Date
 // XX = Interim incrementer
-$version = 2015031300;
+$version = 2015041400;
 
 $composerJson = file_get_contents(dirname(__FILE__) . "/composer.json");
 if ($composerJson === false) {