Merge pull request #162 from magento-api/RC1-bugfixes

[API+Tango] RC1 Bugfixes
magento · Nov 12, 2015 · 4383e60 · 4383e60
2 parents 976b720 + cbaf8dc
commit 4383e60
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
@@ -64,7 +64,8 @@
                                        id="login-password"
                                        name="password"
                                        data-bind="attr: {autocomplete: autocomplete}"
-                                       data-validate="{required:true, 'validate-password':true}"/>
+                                       data-validate="{required:true, 'validate-password':true}"
+                                       autocomplete="off"/>
                             </div>
                         </div>
                         <!-- ko foreach: getRegion('additional-login-form-fields') -->

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -42,19 +42,19 @@
         <div class="field password current required">
             <label class="label" for="current-password"><span><?php /* @escapeNotVerified */ echo __('Current Password') ?></span></label>
             <div class="control">
-                <input type="password" class="input-text" name="current_password" id="current-password">
+                <input type="password" class="input-text" name="current_password" id="current-password" autocomplete="off">
             </div>
         </div>
         <div class="field new password required">
             <label class="label" for="password"><span><?php /* @escapeNotVerified */ echo __('New Password') ?></span></label>
             <div class="control">
-                <input type="password" class="input-text" name="password" id="password">
+                <input type="password" class="input-text" name="password" id="password" autocomplete="off">
             </div>
         </div>
         <div class="field confirm password required">
             <label class="label" for="password-confirmation"><span><?php /* @escapeNotVerified */ echo __('Confirm New Password') ?></span></label>
             <div class="control">
-                <input type="password" class="input-text" name="password_confirmation" id="password-confirmation">
+                <input type="password" class="input-text" name="password_confirmation" id="password-confirmation" autocomplete="off">
             </div>
         </div>
     </fieldset>

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -140,13 +140,13 @@
         <div class="field password required">
             <label for="password" class="label"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
             <div class="control">
-                <input type="password" name="password" id="password" title="<?php /* @escapeNotVerified */ echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}">
+                <input type="password" name="password" id="password" title="<?php /* @escapeNotVerified */ echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}" autocomplete="off">
             </div>
         </div>
         <div class="field confirmation required">
             <label for="password-confirmation" class="label"><span><?php /* @escapeNotVerified */ echo __('Confirm Password') ?></span></label>
             <div class="control">
-                <input type="password" name="password_confirmation" title="<?php /* @escapeNotVerified */ echo __('Confirm Password') ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}">
+                <input type="password" name="password_confirmation" title="<?php /* @escapeNotVerified */ echo __('Confirm Password') ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" autocomplete="off">
             </div>
         </div>
         <?php echo $block->getChildHtml('form_additional_info'); ?>

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -18,13 +18,13 @@
         <div class="field password required">
             <label class="label" for="password"><span><?php /* @escapeNotVerified */ echo __('New Password'); ?></span></label>
             <div class="control">
-                <input type="password" class="input-text" name="password" id="password" data-validate="{required:true, 'validate-password':true}">
+                <input type="password" class="input-text" name="password" id="password" data-validate="{required:true, 'validate-password':true}" autocomplete="off">
             </div>
         </div>
         <div class="field confirmation required">
             <label class="label" for="password-confirmation"><span><?php /* @escapeNotVerified */ echo __('Confirm New Password'); ?></span></label>
             <div class="control">
-                <input type="password" class="input-text" name="password_confirmation" id="password-confirmation" data-validate="{required:true,equalTo:'#password'}">
+                <input type="password" class="input-text" name="password_confirmation" id="password-confirmation" data-validate="{required:true,equalTo:'#password'}" autocomplete="off">
             </div>
         </div>
     </fieldset>

diff --git a/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php b/app/code/Magento/Translation/Model/ResourceModel/StringUtils.php
@@ -210,6 +210,7 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
     {
         $connection = $this->getConnection();
         $table = $this->getMainTable();
+        $translate = htmlspecialchars($translate, ENT_QUOTES);
 
         if ($locale === null) {
             $locale = $this->_localeResolver->getLocale();

diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
@@ -15,13 +15,13 @@
         <div class="admin__field _required field-password">
             <label class="admin__field-label" for="password"><span><?php /* @escapeNotVerified */ echo __('New Password'); ?></span></label>
             <div class="admin__field-control">
-                <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password" placeholder="new password" />
+                <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password" placeholder="new password" autocomplete="off" />
             </div>
         </div>
         <div class="admin__field _required field-confirmation">
             <label class="admin__field-label" for="confirmation"><span><?php /* @escapeNotVerified */ echo __('Confirm New Password'); ?></span></label>
             <div class="admin__field-control">
-                <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation" placeholder="confirm new password" />
+                <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation" placeholder="confirm new password" autocomplete="off" />
             </div>
         </div>
         <div class="form-actions">

diff --git a/setup/view/magento/setup/system-config.phtml b/setup/view/magento/setup/system-config.phtml
@@ -92,6 +92,7 @@
                                    ng-class="{ 'invalid' : (auth.password.$error.required && !auth.password.$pristine)
                                    || (auth.password.$error.required && user.submitted) }"
                                    required
+                                   autocomplete="off"
                                 >
                             <div class="error-container">
                                 This is a required field.