Merge pull request benedmunds#1460 from kgkanatsios/fix-deactivate-us…

…er-identity-subheading Fix bug on user deactivation
ar-rohman · Jul 22, 2020 · cca1882 · cca1882
2 parents 74d06c1 + cc139bf
commit cca1882
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/controllers/Auth.php b/controllers/Auth.php
@@ -429,6 +429,7 @@ public function deactivate($id = NULL)
 			// insert csrf check
 			$this->data['csrf'] = $this->_get_csrf_nonce();
 			$this->data['user'] = $this->ion_auth->user($id)->row();
+			$this->data['identity'] = $this->config->item('identity', 'ion_auth');
 
 			$this->_render_page('auth' . DIRECTORY_SEPARATOR . 'deactivate_user', $this->data);
 		}

diff --git a/views/auth/deactivate_user.php b/views/auth/deactivate_user.php
@@ -1,5 +1,5 @@
 <h1><?php echo lang('deactivate_heading');?></h1>
-<p><?php echo sprintf(lang('deactivate_subheading'), $user->username);?></p>
+<p><?php echo sprintf(lang('deactivate_subheading'), $user->{$identity}); ?></p>
 
 <?php echo form_open("auth/deactivate/".$user->id);?>