Merge branch 'dev'

admin/ajax/users/address/save.php

@@ -69,6 +69,11 @@ QUI::$Ajax->registerFunction(
         $Address->setAttributes($data);
         $Address->save();
 
+        if (isset($data['standard']) && $data['standard'] === 1) {
+            $User->setAttribute('address', $Address->getId());
+            $User->save();
+        }
+
         return $Address->getId();
     },
     ['uid', 'aid', 'data'],

bin/QUI/controls/users/Address.js

@@ -313,7 +313,8 @@ define('controls/users/Address', [
                 city      : this.$City.value,
                 country   : this.$Country.value,
                 mails     : emails,
-                phone     : this.$PhoneGrid.getData()
+                phone     : this.$PhoneGrid.getData(),
+                standard  : this.$Standard.checked ? 1 : 0
             };
 
             Ajax.post('ajax_users_address_save', function () {

lib/templates/headerNoConflict.html

@@ -5,15 +5,15 @@
 
 {if $Template->getAttribute('html5') === false}
 <meta http-equiv="content-language" content="{$Project->getlang()}" />
-<meta name="page-topic" content="{$Site->getAttribute('title')|escape:"html"}" />
+<meta name="page-topic" content='{$Site->getAttribute('title')|escape:'html'}" />
 
 <meta name="date" content="{$Site->getAttribute('e_date')}" />
 <meta name="copyright" content="{$Project->getConfig('meta.copyright')}" />
 <meta name="publisher" content="{$Project->getConfig('meta.publisher')}" />
 {/if}
 
-<meta name="description" content="{$Site->getAttribute('meta.description')|escape:"html"}" />
-<meta name="keywords" content="{$Site->getAttribute('meta.keywords')|escape:"html"}" />
+<meta name="description" content="{$Site->getAttribute('meta.description')|escape:'html'}" />
+<meta name="keywords" content="{$Site->getAttribute('meta.keywords')|escape:'html'}" />
 
 {if $Locale->no_translation}
 <meta name="robots" content="noindex" />
@@ -117,7 +117,7 @@
 
 {if $Template->getAttribute('requirejs')}
 <!-- include components -->
-<script src="{$URL_OPT_DIR}bin/requirejs/require.js?lu={$lastUpdate}"></script>
+<script src="{$URL_OPT_DIR}bin/requirejs/require.js?lu={$lastUpdate}" type="text/javascript"></script>
 <script>
     require.config({
         baseUrl : URL_DIR,
@@ -291,7 +291,7 @@
 {/if}
 
 {if isset($siteScript)}
-<script type="text/javascript" src="{$siteScript}"></script>
+<script src="{$siteScript}" type="text/javascript"></script>
 {/if}
 
 {$headerExtend}