Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: cc7f1bf1f9d1924e70b72b715e4c47fb3912c62e https://github.com/phpmyadmin/phpmyadmin/commit/cc7f1bf1f9d1924e70b72b715e4c... Author: Smita Kumari kumarismita62@gmail.com Date: 2014-03-03 (Mon, 03 Mar 2014)

Changed paths: M prefs_manage.php

Log Message: ----------- bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion

Signed-off-by: Smita Kumari kumarismita62@gmail.com

Commit: 54220a34b3c6cac786e965f5dc9872b55018fe8d https://github.com/phpmyadmin/phpmyadmin/commit/54220a34b3c6cac786e965f5dc98... Author: Marc Delisle marc@infomarc.info Date: 2014-03-03 (Mon, 03 Mar 2014)

Changed paths: M prefs_manage.php

Log Message: ----------- Merge pull request #992 from smita786/QA_4_1

bug fix #4040

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/908df2a24346...54220a34b3c6