Merge branch 'master' into trinidad

2015-01-11 14:02:27 -08:00
parent 4c31598555 6599ae052b
commit b018b39e64
12 changed files with 33 additions and 153 deletions
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -133,7 +133,7 @@ function manage_content(&$a) {
 			intval(get_account_id()),
 			intval(PAGE_REMOVED)
 		);
-		$limit = service_class_fetch(local_user(),'total_identities');
+		$limit = account_service_class_fetch(get_account_id(),'total_identities');
 		if($limit !== false) {
 			$channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit);
 		}