refactor the code on get toolbar block from layout, fix condition on using the mode layout configuration

Author: mariuscris

app/code/Magento/Catalog/Block/Product/ListProduct.php

@@ -163,7 +163,8 @@ private function getDefaultListingMode()
 
         // layout config mode
         $mode = $this->getData('mode');
-        if (!$mode && !isset($availableModes[$mode])) {
+
+        if (!$mode || !isset($availableModes[$mode])) {
             // default config mode
             $mode = $defaultToolbar->getCurrentMode();
         }
@@ -194,13 +195,7 @@ protected function _beforeToHtml()
      */
     private function addToolbarBlock(Collection $collection)
     {
-        $toolbarLayout = false;
-
-        $blockName = $this->getToolbarBlockName();
-
-        if ($blockName) {
-            $toolbarLayout = $this->getLayout()->getBlock($blockName);
-        }
+        $toolbarLayout = $this->getToolbarFromLayout();
 
         if ($toolbarLayout) {
             $this->configureToolbar($toolbarLayout, $collection);
@@ -214,11 +209,7 @@ private function addToolbarBlock(Collection $collection)
      */
     public function getToolbarBlock()
     {
-        $blockName = $this->getToolbarBlockName();
-
-        if ($blockName) {
-            $block = $this->getLayout()->getBlock($blockName);
-        }
+        $block = $this->getToolbarFromLayout();
 
         if (!$block) {
             $block = $this->getLayout()->createBlock($this->_defaultToolbarBlock, uniqid(microtime()));
@@ -227,6 +218,24 @@ public function getToolbarBlock()
         return $block;
     }
 
+    /**
+     * Get toolbar block from layout
+     *
+     * @return bool|Toolbar
+     */
+    private function getToolbarFromLayout()
+    {
+        $blockName = $this->getToolbarBlockName();
+
+        $toolbarLayout = false;
+
+        if ($blockName) {
+            $toolbarLayout = $this->getLayout()->getBlock($blockName);
+        }
+
+        return $toolbarLayout;
+    }
+
     /**
      * Retrieve additional blocks html
      *