mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-26 12:27:06 +00:00 
			
		
		
		
	Remove duplicated if bodies (#5121)
This commit is contained in:
		 Oleg Kovalov
					Oleg Kovalov
				
			
				
					committed by
					
						 techknowlogick
						techknowlogick
					
				
			
			
				
	
			
			
			 techknowlogick
						techknowlogick
					
				
			
						parent
						
							616b8f42f9
						
					
				
				
					commit
					a908b29a74
				
			| @@ -14,6 +14,7 @@ import ( | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"image" | ||||
|  | ||||
| 	// Needed for jpeg support | ||||
| 	_ "image/jpeg" | ||||
| 	"image/png" | ||||
| @@ -377,12 +378,8 @@ func (u *User) GetFollowers(page int) ([]*User, error) { | ||||
| 	users := make([]*User, 0, ItemsPerPage) | ||||
| 	sess := x. | ||||
| 		Limit(ItemsPerPage, (page-1)*ItemsPerPage). | ||||
| 		Where("follow.follow_id=?", u.ID) | ||||
| 	if setting.UsePostgreSQL { | ||||
| 		sess = sess.Join("LEFT", "follow", "`user`.id=follow.user_id") | ||||
| 	} else { | ||||
| 		sess = sess.Join("LEFT", "follow", "`user`.id=follow.user_id") | ||||
| 	} | ||||
| 		Where("follow.follow_id=?", u.ID). | ||||
| 		Join("LEFT", "follow", "`user`.id=follow.user_id") | ||||
| 	return users, sess.Find(&users) | ||||
| } | ||||
|  | ||||
| @@ -396,12 +393,8 @@ func (u *User) GetFollowing(page int) ([]*User, error) { | ||||
| 	users := make([]*User, 0, ItemsPerPage) | ||||
| 	sess := x. | ||||
| 		Limit(ItemsPerPage, (page-1)*ItemsPerPage). | ||||
| 		Where("follow.user_id=?", u.ID) | ||||
| 	if setting.UsePostgreSQL { | ||||
| 		sess = sess.Join("LEFT", "follow", "`user`.id=follow.follow_id") | ||||
| 	} else { | ||||
| 		sess = sess.Join("LEFT", "follow", "`user`.id=follow.follow_id") | ||||
| 	} | ||||
| 		Where("follow.user_id=?", u.ID). | ||||
| 		Join("LEFT", "follow", "`user`.id=follow.follow_id") | ||||
| 	return users, sess.Find(&users) | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user