Dev Removed function from global namespace.

LimeSurvey · Jul 22, 2014 · 33b5157 · 33b5157 · Shnoulle · Aug 1, 2014
1 parent e07db88
commit 33b5157
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -12,22 +12,6 @@
 */
 Yii::import('application.helpers.sanitize_helper', true);
 
-/**
-* Simple function to sort the permissions by title
-*
-* @param mixed $aPermissionA  Permission A to compare
-* @param mixed $aPermissionB  Permission B to compare
-*/
-function comparePermission($aPermissionA,$aPermissionB)
-{
-    if($aPermissionA['title'] >$aPermissionB['title']) {
-        return 1;
-    }
-    else {
-        return -1;
-    }
-}
-
 /**
  * Translation helper function.
  * @param string $string

diff --git a/application/models/Permission.php b/application/models/Permission.php
@@ -73,7 +73,9 @@ public static function getSurveyBasePermissions()
             'tokens'=>array('create'=>true,'read'=>true,'update'=>true,'delete'=>true,'import'=>true,'export'=>true,'title'=>$clang->gT("Tokens"),'description'=>$clang->gT("Permission to create/update/delete/import/export token entries"),'img'=>'tokens'),
             'translations'=>array('create'=>false,'read'=>true,'update'=>true,'delete'=>false,'import'=>false,'export'=>false,'title'=>$clang->gT("Quick translation"),'description'=>$clang->gT("Permission to view & update the translations using the quick-translation feature"),'img'=>'translate')
         );
-        uasort($aPermissions,"comparePermission");
+		uasort($aPermissions, function ($a, $b) {
+			return strcmp($a['title'], $b['title']);
+		});
         return $aPermissions;
     }