Profile Edit Works#88
Conversation
yuxiang-zhang
left a comment
yuxiang-zhang
left a comment
There was a problem hiding this comment.
Please remove irrelevant files
| $user_id = $_SESSION['user_id']; | ||
| $userimage=$getUserManager->image_retrieve($user_id); | ||
| echo' <center> <img src="data:image/jpeg;base64,'.($userimage['profile_image']).'" height="100" width="100"/> </center>'; | ||
| $userimage=UserManager::image_retrieve($user_id); |
There was a problem hiding this comment.
I believe there is a function called getUserFromId
|
The changes in the master weren't merged properly. |
|
I didn't added any file, I am using ecelipse for editing , I don't that's why some files gets added. Everything works in my computer locally. If I click the button Edit , it goes to the page editing profile and when you put new information , it gets updated |
|
What you can do merge it then change if anything necessary but it's works in computer , I can show it to you |
Code works, granted. If you were to ask my opinion, it's bad code. Duplicated code and messed up merges from master. If I merge it messes up everything I've done for at least 10 hours. If you were to ask me to review, I disapprove these code. I will not merge them, unless you change them. |
|
Well other guys are also working on this. I actually made it works. If you want , we can discuss with prof his office our about it Or go to TA |
You messed up my commits, that is the problem. You can even merge this yourself. |
|
I don't see any merge conflict. I don't really understand, how did I messed up your commit. I just fixed the edit profile page. |
You messed up my commits, that is the problem. You can even merge this yourself.
Tests should pass. No merge conflicts since you deleted conflicting code. But not the right ones. |
2 participants
Please review and merge.