Merge branch 'master' of git@github.com:/gallery/gallery3

Conflicts:
	modules/server_add/controllers/admin_server_add.php

1 files changed, 21 insertions, 0 deletions

diff --git a/modules/gallery/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php b/modules/gallery/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
new file mode 100644
index 00000000..c7e27afb
--- /dev/null
+++ b/modules/gallery/lib/HTMLPurifier/HTMLPurifier/HTMLModule/Name.php
@@ -0,0 +1,21 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+
+class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
+{
+
+    public $name = 'Name';
+
+    public function setup($config) {
+        $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
+        foreach ($elements as $name) {
+            $element = $this->addBlankElement($name);
+            $element->attr['name'] = 'CDATA';
+            if (!$config->get('HTML.Attr.Name.UseCDATA')) {
+                $element->attr_transform_post['NameSync'] = new HTMLPurifier_AttrTransform_NameSync();
+            }
+        }
+    }
+
+}
+
+// vim: et sw=4 sts=4