diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-11-25 13:40:47 -0800 |
| commit | f50dbd992d6973caeaaa3139ddf5f908dd84ec79 (patch) | |
| tree | cbdb343de89306a4ed823dc5aa104a802f846dc4 /modules/gallery/tests/xss_data.txt | |
| parent | 2e420522ece22942a9b3b6ee413ca0e1dfa76148 (diff) | |
| parent | dc67cf64813361b34c366123f37d88ef6988fcc8 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/controllers/rest.php
Diffstat (limited to 'modules/gallery/tests/xss_data.txt')
| -rw-r--r-- | modules/gallery/tests/xss_data.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index fa818636..3708bc6d 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -298,8 +298,8 @@ modules/server_add/views/server_add_tree_dialog.html.php 4 DIRTY_JS url::s modules/server_add/views/server_add_tree_dialog.html.php 21 DIRTY $tree modules/tag/views/admin_tags.html.php 45 DIRTY_ATTR $tag->id modules/tag/views/admin_tags.html.php 46 DIRTY $tag->count -modules/tag/views/tag_block.html.php 27 DIRTY $cloud -modules/tag/views/tag_block.html.php 29 DIRTY $form +modules/tag/views/tag_block.html.php 25 DIRTY $cloud +modules/tag/views/tag_block.html.php 27 DIRTY $form modules/tag/views/tag_cloud.html.php 4 DIRTY_ATTR (int)(($tag->count/$max_count)*7) modules/tag/views/tag_cloud.html.php 5 DIRTY $tag->count modules/tag/views/tag_cloud.html.php 6 DIRTY_JS $tag->url() |