From 0ed7bd8a5b6e75128d766e15abb19e075ee9aa5a Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 17 Aug 2013 19:17:17 +0300
Subject: [PATCH 1/3] [ticket/11800] Remove forum_fn from
 memberlist_search.html

PHPBB3-11800
---
 phpBB/styles/prosilver/template/memberlist_search.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index 4f029627fc..f9538ef2e2 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -38,7 +38,6 @@ function insert_single(user)
 // ]]>
 </script>
 <!-- ENDIF -->
-<!-- INCLUDEJS forum_fn.js -->
 <h2 class="solo">{L_FIND_USERNAME}</h2>
 
 <form method="post" action="{S_MODE_ACTION}" id="search_memberlist">

From 487822d12f9053ad1728f68031595f01293e59e2 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 17 Aug 2013 19:18:25 +0300
Subject: [PATCH 2/3] [ticket/11800] Fix JavaScript in simple_footer.html

Include forum_fn.js via INCLUDEJS
Move $SCRIPTS after footer event, allowing extensions to include scripts
Use correct template variable for including scripts

PHPBB3-11800
---
 phpBB/styles/prosilver/template/simple_footer.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 144ae8e462..b6afc2fdba 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -8,9 +8,11 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
-{SCRIPTS}
+<!-- INCLUDEJS forum_fn.js -->
 
 <!-- EVENT simple_footer_after -->
+
+{$SCRIPTS}
+
 </body>
 </html>

From 917478876297d17bff0f9dff446d1021a150692e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sat, 17 Aug 2013 19:21:10 +0300
Subject: [PATCH 3/3] [ticket/11800] Fix scripts variable in subsilver
 simple_footer

PHPBB3-11800
---
 phpBB/styles/subsilver2/template/simple_footer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html
index c847bfedcc..48d3d934f8 100644
--- a/phpBB/styles/subsilver2/template/simple_footer.html
+++ b/phpBB/styles/subsilver2/template/simple_footer.html
@@ -7,8 +7,9 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
-{SCRIPTS}
 
 <!-- EVENT simple_footer_after -->
+
+{$SCRIPTS}
 </body>
 </html>