From 6be1c6049d17869c63d9794df6ef70d2f0157f45 Mon Sep 17 00:00:00 2001 From: Mate Bartus Date: Fri, 29 Jan 2016 13:52:07 +0100 Subject: [PATCH] [ticket/14262] Fix stage navigation PHPBB3-14262 --- .../install/convert/controller/convertor.php | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/phpBB/install/convert/controller/convertor.php b/phpBB/install/convert/controller/convertor.php index c9d78bd438..a36494c7e6 100644 --- a/phpBB/install/convert/controller/convertor.php +++ b/phpBB/install/convert/controller/convertor.php @@ -800,6 +800,7 @@ class convertor private function setup_navigation($stage) { $active = true; + $completed = false; switch ($stage) { @@ -808,16 +809,12 @@ class convertor array('convert', 0, 'finish'), array( 'selected' => $active, - 'completed' => false, + 'completed' => $completed, ) ); $active = false; - - $this->navigation_provider->set_nav_property( - array('convert', 0, 'convert'), - array('completed' => true) - ); + $completed = true; // no break; case 'convert': @@ -825,16 +822,12 @@ class convertor array('convert', 0, 'convert'), array( 'selected' => $active, - 'completed' => false, + 'completed' => $completed, ) ); $active = false; - - $this->navigation_provider->set_nav_property( - array('convert', 0, 'settings'), - array('completed' => true) - ); + $completed = true; // no break; case 'settings': @@ -842,19 +835,12 @@ class convertor array('convert', 0, 'settings'), array( 'selected' => $active, - 'completed' => false, + 'completed' => $completed, ) ); $active = false; - - $this->navigation_provider->set_nav_property( - array('convert', 0, 'intro'), - array( - 'selected' => $active, - 'completed' => false, - ) - ); + $completed = true; // no break; case 'intro': @@ -862,7 +848,7 @@ class convertor array('convert', 0, 'intro'), array( 'selected' => $active, - 'completed' => false, + 'completed' => $completed, ) ); break;