Merge pull request #11 in PLUG_FREE/frontend_swagcustomsort from bugfix/PT-3324-manufacturer-page-error to master

mitelg · mitelg · commit 8c71d71b5319 · 2015-07-02T10:28:43.000+02:00
* commit '7adb5e7df57f6e9536558fa7591a6cf178765a25':
  PT-3324 fix error for manufacturer page when custom sort is applied
diff --git a/Subscriber/Sort.php b/Subscriber/Sort.php
@@ -54,6 +54,12 @@ public function onCreateListingCriteria(Enlight_Event_EventArgs $args)
     {
         $request = $args->get('request');
         $criteria = $args->get('criteria');
+
+        //Don't apply custom sort if we are not in category listing
+        if ($request->getActionName() != 'index') {
+            return;
+        }
+
         $sorter = new SortFactory($request, $criteria);
         $sorter->addSort();
     }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,12 @@ public function onCreateListingCriteria(Enlight_Event_EventArgs $args)`
`54`	`54`	`{`
`55`	`55`	`$request = $args->get('request');`
`56`	`56`	`$criteria = $args->get('criteria');`
	`57`	`+`
	`58`	`+ //Don't apply custom sort if we are not in category listing`
	`59`	`+ if ($request->getActionName() != 'index') {`
	`60`	`+ return;`
	`61`	`+ }`
	`62`	`+`
`57`	`63`	`$sorter = new SortFactory($request, $criteria);`
`58`	`64`	`$sorter->addSort();`
`59`	`65`	`}`