From de20f3af2a8b2291ee4b4411df34a47c0d7a164c Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Thu, 4 Dec 2014 15:21:27 +0000
Subject: [PATCH] Match labels with element ids.

Refs #4578
- Match label "for" attributes with ids from the inputs they're
  labeling.
- Remove extra promise generation from ghost header and footer helpers.
---
 core/client/templates/settings/code-injection.hbs | 6 +++---
 core/server/helpers/ghost_foot.js                 | 2 --
 core/server/helpers/ghost_head.js                 | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/client/templates/settings/code-injection.hbs b/core/client/templates/settings/code-injection.hbs
index 10281de526..7794befb67 100644
--- a/core/client/templates/settings/code-injection.hbs
+++ b/core/client/templates/settings/code-injection.hbs
@@ -16,15 +16,15 @@
             </div>
 
             <div class="form-group">
-                <label for="blog-header">Blog Header</label>
+                <label for="ghost-head">Blog Header</label>
                 <p>Code here will be injected to the \{{ghost_head}} helper at the top of your page</p>
                 {{textarea id="ghost-head" name="codeInjection[ghost_head]" type="text" value=ghost_head}}
             </div>
 
             <div class="form-group">
-                <label for="blog-header">Blog Footer</label>
+                <label for="ghost-foot">Blog Footer</label>
                 <p>Code here will be injected to the \{{ghost_foot}} helper at the bottom of your page</p>
-                {{textarea id="blog-foot" name="codeInjection[ghost_foot]" type="text" value=ghost_foot}}
+                {{textarea id="ghost-foot" name="codeInjection[ghost_foot]" type="text" value=ghost_foot}}
             </div>
         </fieldset>
     </form>
diff --git a/core/server/helpers/ghost_foot.js b/core/server/helpers/ghost_foot.js
index 2de031fc69..01406e0a67 100644
--- a/core/server/helpers/ghost_foot.js
+++ b/core/server/helpers/ghost_foot.js
@@ -26,8 +26,6 @@ ghost_foot = function (options) {
 
     return api.settings.read({key: 'ghost_foot'}).then(function (response) {
         foot.push(response.settings[0].value);
-        return foot;
-    }).then(function (foot) {
         return filters.doFilter('ghost_foot', foot);
     }).then(function (foot) {
         var footString = _.reduce(foot, function (memo, item) { return memo + ' ' + item; }, '');
diff --git a/core/server/helpers/ghost_head.js b/core/server/helpers/ghost_head.js
index ce424c8e5a..e8dc056295 100644
--- a/core/server/helpers/ghost_head.js
+++ b/core/server/helpers/ghost_head.js
@@ -162,8 +162,6 @@ ghost_head = function (options) {
         return api.settings.read({key: 'ghost_head'});
     }).then(function (response) {
         head.push(response.settings[0].value);
-        return head;
-    }).then(function (head) {
         return filters.doFilter('ghost_head', head);
     }).then(function (head) {
         var headString = _.reduce(head, function (memo, item) { return memo + '\n    ' + item; }, '');