Merge remote-tracking branch 'caliblur/master'
This commit is contained in:
		
						commit
						2436c6a118
					
				| 
						 | 
					@ -363,7 +363,7 @@ $( '#logout' ).parent().addClass( 'dropdown' ).appendTo( '.profileDropli' );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Remove the modals except from some areas where they are needed
 | 
					// Remove the modals except from some areas where they are needed
 | 
				
			||||||
bodyClass = $( 'body' ).attr( 'class' ).split(' ');
 | 
					bodyClass = $( 'body' ).attr( 'class' ).split(' ');
 | 
				
			||||||
modalWanted = ['admin', 'editbook', 'config', 'uiconfig'];
 | 
					modalWanted = ['admin', 'editbook', 'config', 'uiconfig', 'me', 'edituser'];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if ( $.inArray( bodyClass[0], modalWanted) != -1 ) {
 | 
					if ( $.inArray( bodyClass[0], modalWanted) != -1 ) {
 | 
				
			||||||
} else {
 | 
					} else {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user