Merge remote-tracking branch 'origin/MAGETWO-52650-plugins' into develop

bwaters · bwaters · commit e1f09651f610 · 2016-05-13T15:11:58.000-05:00
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -212,9 +212,9 @@ protected function _sort($itemA, $itemB)
             }
             return $itemA['sortOrder'];
         } elseif (isset($itemB['sortOrder'])) {
-            return $itemB['sortOrder'];
+            return (0 - (int)$itemB['sortOrder']);
         } else {
-            return 1;
+            return 0;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,9 @@ protected function _sort($itemA, $itemB)`
`212`	`212`	`}`
`213`	`213`	`return $itemA['sortOrder'];`
`214`	`214`	`} elseif (isset($itemB['sortOrder'])) {`
`215`		`- return $itemB['sortOrder'];`
	`215`	`+ return (0 - (int)$itemB['sortOrder']);`
`216`	`216`	`} else {`
`217`		`- return 1;`
	`217`	`+ return 0;`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`