Merge branch 'release/1.0.0'

oc-shopaholic · Apr 17, 2019 · 8f86e2a · 8f86e2a
2 parents 0cbffc6 + c3f14ed
commit 8f86e2a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 139 deletions.
diff --git a/components/ArticleList.php b/components/ArticleList.php
@@ -13,9 +13,6 @@
  */
 class ArticleList extends SortingElementList
 {
-    /** @var  ArticleListStore */
-    protected $obArticleListStore;
-
     /**
      * @return array
      */
@@ -59,7 +56,7 @@ public function make($arElementIDList = null)
     {
         return ArticleCollection::make($arElementIDList);
     }
-    
+
     public function onAjaxRequest()
     {
         return true;

diff --git a/components/ArticlePage.php b/components/ArticlePage.php
@@ -25,7 +25,7 @@ public function componentDetails()
             'description' => 'lovata.goodnews::lang.component.article_page_desc'
         ];
     }
-    
+
     /**
      * Get element object
      * @param string $sElementSlug
@@ -36,17 +36,17 @@ protected function getElementObject($sElementSlug)
         if(empty($sElementSlug)) {
             return null;
         }
-        
+
         $obElement = Article::getBySlug($sElementSlug)
             ->getByStatus(Article::STATUS_PUBLISHED)
             ->getPublished()
             ->first();
-        
+
         if(!empty($obElement)) {
             $obElement->view_count++;
             $obElement->save();
         }
-        
+
         return $obElement;
     }
 

diff --git a/components/CategoryData.php b/components/CategoryData.php
diff --git a/components/CategoryList.php b/components/CategoryList.php
diff --git a/components/CategoryPage.php b/components/CategoryPage.php