X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=eb019ac7ee849f97d243295c0ce164f7da293773;hb=0ba99486039b10686a520e22ef50385625e5b9ae;hp=a0c1b5fcb0cd85f9543e29bbec5d27c1638a31d9;hpb=f055d2643be700ea9be6bd4b61b49111244b31a2;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index a0c1b5fcb0..eb019ac7ee 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -366,8 +366,8 @@ function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
 
 # salted, hashed passwords are stored in the DB
 
-function common_munge_password($id, $password) {
-	return md5($id . $password);
+function common_munge_password($password, $id) {
+	return md5($password . $id);
 }
 
 # check if a username exists and has matching password
@@ -557,7 +557,7 @@ function common_fancy_url($action, $args=NULL) {
 	 case 'foaf':
 		return common_path($args['nickname'].'/'.$action);
 	 case 'subscriptions':
-	 case 'subscribed':
+	 case 'subscribers':
 	 case 'all':
 		if ($args && $args['page']) {
 			return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);