Refix group sorting. We must compare to 0.

cdujeu · cdujeu · commit 07d8cdcbd88d · 2016-07-04T14:50:05.000+02:00
diff --git a/core/src/plugins/core.conf/class.AbstractAjxpUser.php b/core/src/plugins/core.conf/class.AbstractAjxpUser.php
@@ -553,7 +553,7 @@ protected function orderRoles($r1, $r2)
         if(strpos($r2, "AJXP_USR_") === 0) return -1;
 
         // Two groups, sort by string, will magically keep group hierarchy
-        if(strpos($r1, "AJXP_GRP_") === false && strpos($r2, "AJXP_GRP_") === false) {
+        if(strpos($r1, "AJXP_GRP_") === 0 && strpos($r2, "AJXP_GRP_") === 0) {
             return strcmp($r1,$r2);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -553,7 +553,7 @@ protected function orderRoles($r1, $r2)`
`553`	`553`	`if(strpos($r2, "AJXP_USR_") === 0) return -1;`
`554`	`554`
`555`	`555`	`// Two groups, sort by string, will magically keep group hierarchy`
`556`		`- if(strpos($r1, "AJXP_GRP_") === false && strpos($r2, "AJXP_GRP_") === false) {`
	`556`	`+ if(strpos($r1, "AJXP_GRP_") === 0 && strpos($r2, "AJXP_GRP_") === 0) {`
`557`	`557`	`return strcmp($r1,$r2);`
`558`	`558`	`}`
`559`	`559`