Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 63b913708ad9cf3a185850736e956acef175ce07 https://github.com/phpmyadmin/phpmyadmin/commit/63b913708ad9cf3a185850736e95... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-06-12 (Wed, 12 Jun 2013)

Changed paths: M libraries/server_privileges.lib.php M server_privileges.php

Log Message: ----------- Fix bug#3922, user privileges-database name unescaped

Commit: da4bd451368ae4b516ac30884f2716432f902f4c https://github.com/phpmyadmin/phpmyadmin/commit/da4bd451368ae4b516ac30884f27... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-06-12 (Wed, 12 Jun 2013)

Changed paths: M db_tracking.php M libraries/config/FormDisplay.tpl.php M libraries/config/config_functions.lib.php M libraries/insert_edit.lib.php M libraries/ip_allow_deny.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Export_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/sql.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/kn.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/zh_CN.po M po/zh_TW.po M server_engines.php A test/classes/plugin/transformations/Text_Plain_Append_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/31cdfdaf691d...da4bd451368a