mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-30 20:51:22 +00:00 
			
		
		
		
	Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
		
						commit
						d6106c0673
					
				|  | @ -603,7 +603,7 @@ $(document).ready( function() { | |||
| 		$options[] = array("-1", getMLText("choose_user")); | ||||
| 		$options[] = array("0", getMLText("add_user")); | ||||
| 		foreach ($users as $currUser) { | ||||
| 			$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), $seluser && $currUser->getID()==$seluser->getID(), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); | ||||
| 			$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), $seluser && $currUser->getID()==$seluser->getID(), array(array('data-subtitle', htmlspecialchars($currUser->getEmail())))); | ||||
| 		} | ||||
| 		$this->formField( | ||||
| 			null, //getMLText("selection"),
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann