From b43349f4de3612da1757a9293d205e081640e106 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sun, 10 Mar 2013 22:08:16 +0100
Subject: #2048 - Remove unneeded jquery.autocomplete.css/js inclusions. -
 removed autocomplete.css/js calls in server_add, tag, and g2_import. -
 revised xss_data.txt golden file (line number changes only).

---
 modules/g2_import/views/admin_g2_import.html.php   |  2 --
 modules/gallery/tests/xss_data.txt                 | 10 +++++-----
 modules/server_add/views/admin_server_add.html.php |  2 --
 modules/tag/helpers/tag_theme.php                  |  4 +---
 4 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index fd9487e4..adde83ce 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,6 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->css("jquery.autocomplete.css") ?>
-<?= $theme->script("jquery.autocomplete.js") ?>
 <script type="text/javascript">
 $("document").ready(function() {
   $("form input[name=embed_path]").gallery_autocomplete(
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 7e77a70b..5daaa371 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -41,8 +41,8 @@ modules/comment/views/user_profile_comments.html.php         10  DIRTY_JS $comme
 modules/comment/views/user_profile_comments.html.php         11  DIRTY    $comment->item()->thumb_img(array(),50)
 modules/exif/views/exif_dialog.html.php                      14  DIRTY    $details[$i]["caption"]
 modules/exif/views/exif_dialog.html.php                      21  DIRTY    $details[$i]["caption"]
-modules/g2_import/views/admin_g2_import.html.php             7   DIRTY_JS url::site("__ARGS__")
-modules/g2_import/views/admin_g2_import.html.php             49  DIRTY    $form
+modules/g2_import/views/admin_g2_import.html.php             5   DIRTY_JS url::site("__ARGS__")
+modules/g2_import/views/admin_g2_import.html.php             47  DIRTY    $form
 modules/gallery/views/admin_advanced_settings.html.php       21  DIRTY_ATTR text::alternate("g-odd","g-even")
 modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY_ATTR log::severity_class($entry->severity)
 modules/gallery/views/admin_block_log_entries.html.php       8   DIRTY_JS user_profile::url($entry->user->id)
@@ -350,9 +350,9 @@ modules/search/views/search.html.php                         45  DIRTY    $item-
 modules/search/views/search.html.php                         47  DIRTY_ATTR $item_class
 modules/search/views/search.html.php                         57  DIRTY    $theme->paginator()
 modules/search/views/search_link.html.php                    15  DIRTY_ATTR $album_id
-modules/server_add/views/admin_server_add.html.php           8   DIRTY_JS url::site("__ARGS__")
-modules/server_add/views/admin_server_add.html.php           16  DIRTY    $form
-modules/server_add/views/admin_server_add.html.php           27  DIRTY_ATTR $id
+modules/server_add/views/admin_server_add.html.php           6   DIRTY_JS url::site("__ARGS__")
+modules/server_add/views/admin_server_add.html.php           14  DIRTY    $form
+modules/server_add/views/admin_server_add.html.php           25  DIRTY_ATTR $id
 modules/server_add/views/server_add_tree.html.php            20  DIRTY_ATTR is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
 modules/server_add/views/server_add_tree.html.php            21  DIRTY_ATTR is_dir($file)?"g-directory":"g-file"
 modules/server_add/views/server_add_tree_dialog.html.php     3   DIRTY_JS url::site("server_add/children?path=__PATH__")
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 5ad142f3..f7e596b4 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,7 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->css("server_add.css") ?>
-<?= $theme->css("jquery.autocomplete.css") ?>
-<?= $theme->script("jquery.autocomplete.js") ?>
 <script type="text/javascript">
 $("document").ready(function() {
   $("#g-path").gallery_autocomplete(
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index 81d1352f..143af6c1 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,9 +19,7 @@
  */
 class tag_theme_Core {
   static function head($theme) {
-    return $theme->css("jquery.autocomplete.css")
-      . $theme->script("jquery.autocomplete.js")
-      . $theme->css("tag.css");
+    return $theme->css("tag.css");
   }
 
   static function admin_head($theme) {
-- 
cgit v1.2.3