From abcdcf82bb5a047252cf0592eea7e951da401b21 Mon Sep 17 00:00:00 2001
From: Mark Hamstra <hello@markhamstra.com>
Date: Tue, 12 Jan 2016 13:22:43 +0100
Subject: [PATCH 1/2] Ensure $restarted in templates/language.tpl always exists

This was causing 2 E_NOTICE errors being triggered when opening the setup and landing on the ?action=set step. See #12846 for details.
---
 setup/controllers/language.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup/controllers/language.php b/setup/controllers/language.php
index 9dd5b7ea5e0..f37879d4ee5 100644
--- a/setup/controllers/language.php
+++ b/setup/controllers/language.php
@@ -37,5 +37,8 @@
 if (!empty($_REQUEST['restarted'])) {
     $parser->set('restarted',true);
 }
+else {
+    $parser->set('restarted', false);
+}
 
 return $parser->render('language.tpl');

From 93d135c98d78376b8a5826773addaf1a81cb9127 Mon Sep 17 00:00:00 2001
From: Mark Hamstra <hello@markhamstra.com>
Date: Mon, 18 Jan 2016 17:28:10 +0100
Subject: [PATCH 2/2] Simplify check into a ternary operator

---
 setup/controllers/language.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/setup/controllers/language.php b/setup/controllers/language.php
index f37879d4ee5..361f32622f0 100644
--- a/setup/controllers/language.php
+++ b/setup/controllers/language.php
@@ -34,11 +34,6 @@
 }
 $parser->set('languages',$languages);
 
-if (!empty($_REQUEST['restarted'])) {
-    $parser->set('restarted',true);
-}
-else {
-    $parser->set('restarted', false);
-}
+$parser->set('restarted', !empty($_REQUEST['restarted']));
 
 return $parser->render('language.tpl');