Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
 + Patch #3506552 Contest-2: Show index information in the data dictionary
 + Patch #3510656 Contest-1: Ignoring foreign keys while dropping tables
 - Bug #3509686 Reverting sort on joined column does not work
++ New transformation: append string
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

libraries/transformations/text_plain__append.inc.php

@@ -0,0 +1,25 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @package phpMyAdmin-Transformation
+ * Has one option: the text to be appended (default '')
+ */
+
+function PMA_transformation_text_plain__append_info() {
+    return array(
+        'info' => __('Appends text to a string. The only option is the text to be appended (enclosed in single quotes, default empty string).'),
+        );
+}
+
+function PMA_transformation_text_plain__append($buffer, $options = array(), $meta = '') {
+
+    if (! isset($options[0]) ||  $options[0] == '') {
+        $options[0] = '';
+    }
+
+    $newtext = $buffer . htmlspecialchars($options[0]);  //just append the option to the original text
+
+    return $newtext;
+}
+
+?>