Merge pull request select2#703 from jelte12345/master

Fixed my own XSS pull request to actually work

Author: ivaynberg

select2.js

@@ -2450,16 +2450,15 @@ the specific language governing permissions and limitations under the Apache Lic
         escapeMarkup: function (markup) {
             var replace_map = {
                 '\\': '\',
-                '&': '&#amp;',
-                '<': '&#lt;',
-                '>': '&#rt;',
-                '"': '&#quot;',
-                "'": '&#39;',
-                "/": '&#x2F;'
+                '&': '&amp;',
+                '<': '&lt;',
+                '>': '&gt;',
+                '"': '&quot;',
+                "'": '&apos;',
+                "/": '&#47;'
             };
-            //'--': '-&#45;'
 
-            return String(html).replace(/[&<>"'/\\]/g, function (match) {
+            return String(markup).replace(/[&<>"'/\\]/g, function (match) {
                     return replace_map[match[0]];
             });