From 832d410303f7876360b749db7876068a05145161 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 28 Feb 2012 00:34:15 +0100
Subject: [PATCH] MINOR Merge errors

---
 admin/code/LeftAndMain.php                       | 1 +
 admin/templates/Includes/LeftAndMain_EditForm.ss | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
index 21ec7ff06..faf54cfa5 100644
--- a/admin/code/LeftAndMain.php
+++ b/admin/code/LeftAndMain.php
@@ -474,6 +474,7 @@ class LeftAndMain extends Controller {
 	 * Return a list of appropriate templates for this class, with the given suffix
 	 */
 	public function getTemplatesWithSuffix($suffix) {
+		$templates = array();
 		$classes = array_reverse(ClassInfo::ancestry($this->class));
 		foreach($classes as $class) {
 			$template = $class . $suffix;
diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss
index 451a4430f..69795e216 100644
--- a/admin/templates/Includes/LeftAndMain_EditForm.ss
+++ b/admin/templates/Includes/LeftAndMain_EditForm.ss
@@ -23,7 +23,7 @@
 			<!-- <div class="cms-content-search">...</div> -->
 
 			<% if Backlink %>
-				<a class="backlink ss-ui-button" href="$Backlink">
+				<a class="backlink ss-ui-button cms-panel-link" data-icon="back" href="$Backlink">
 					<% _t('Back', 'Back') %>
 				</a>
 			<% end_if %>