FIX issue #25 - error on admin

magespecialist · Nov 3, 2017 · 2bd0fe8 · 2bd0fe8
1 parent afbb6f4
commit 2bd0fe8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/Observer/CoreCollectionAbstractLoadAfter.php b/Observer/CoreCollectionAbstractLoadAfter.php
@@ -52,19 +52,23 @@ public function __construct(
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         if ($this->config->isActive()) {
-            $obj = $observer->getEvent()->getCollection();
+            try {
+                $obj = $observer->getEvent()->getCollection();
+                $objName = preg_replace("/\\\\Interceptor$/", "", get_class($obj));
 
-            $objName = preg_replace("/\\\\Interceptor$/", "",
-                get_class($obj));
+                // @codingStandardsIgnoreStart
+                $objId = md5($objName . '::' . $obj->getSelect());
+                // @codingStandardsIgnoreEnd
 
-            $objId = md5($objName . '::' . $obj->getSelect());
-
-            $this->collectionRegistry->stop($objId, [
-                'collection' => $objName,
-                'items' => $obj->getSize(),
-                'page_num' => $obj->getCurPage(),
-                'sql' => '' . $obj->getSelect()
-            ]);
+                $this->collectionRegistry->stop($objId, [
+                    'collection' => $objName,
+                    'items' => $obj->getSize(),
+                    'page_num' => $obj->getCurPage(),
+                    'sql' => '' . $obj->getSelect()
+                ]);
+            } catch (\Exception $e) {
+                return;
+            }
         }
     }
 }
diff --git a/etc/module.xml b/etc/module.xml
@@ -21,7 +21,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MSP_DevTools" setup_version="1.2.7">
+    <module name="MSP_DevTools" setup_version="1.2.8">
         <sequence>
             <module name="MSP_Common"/>