Merge pull request #12759 from owncloud/core-reduce-js-and-css

make sure styles and scripts are only loaded once

2 files changed, 14 insertions, 5 deletions

diff --git a/core/templates/installation.php b/core/templates/installation.php
index 9ef63dbfe8c..0b3b0d46c5c 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,3 +1,9 @@
+<?php
+script('core', [
+	'jquery-showpassword',
+	'installation'
+]);
+?>
 <input type='hidden' id='hasMySQL' value='<?php p($_['hasMySQL']) ?>'>
 <input type='hidden' id='hasSQLite' value='<?php p($_['hasSQLite']) ?>'>
 <input type='hidden' id='hasPostgreSQL' value='<?php p($_['hasPostgreSQL']) ?>'>
diff --git a/core/templates/login.php b/core/templates/login.php
index 86a1b605df5..2198f063dbc 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,5 +1,11 @@
 <?php /** @var $l OC_L10N */ ?>
-<?php vendor_script('jsTimezoneDetect/jstz') ?>
+<?php
+vendor_script('jsTimezoneDetect/jstz');
+script('core', [
+	'visitortimezone',
+	'lostpassword'
+]);
+?>
 
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form method="post" name="login">
@@ -65,8 +71,5 @@
 		</ul>
 	</fieldset>
 </form>
-<?php } ?>
+<?php }
 
-<?php
-OCP\Util::addscript('core', 'visitortimezone');
-OCP\Util::addScript('core', 'lostpassword');