[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 53f96b: bug #3546277 [core] Call to undefined function __(...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 53f96bd760ee1b1a89db397f71962152764c9a07 https://github.com/phpmyadmin/phpmyadmin/commit/53f96bd760ee1b1a89db397f719… Author: J.M <me(a)mynetx.net> Date: 2012-08-06 (Mon, 06 Aug 2012) Changed paths: M ChangeLog M libraries/Config.class.php M libraries/common.inc.php Log Message: ----------- bug #3546277 [core] Call to undefined function __() when config file has wrong permissions Commit: b024d858b8062b4ae0b0544dab3b9fa70207b413 https://github.com/phpmyadmin/phpmyadmin/commit/b024d858b8062b4ae0b0544dab3… Author: Aputsiaq Niels Janussen <aj(a)isit.gl> Date: 2012-08-06 (Mon, 06 Aug 2012) Changed paths: M po/da.po Log Message: ----------- Translated using Weblate. Commit: 2d639ab5734a1609f02c2cb547e0e5969578ad4c https://github.com/phpmyadmin/phpmyadmin/commit/2d639ab5734a1609f02c2cb547e… Author: Weblate <noreply(a)weblate.org> Date: 2012-08-06 (Mon, 06 Aug 2012) Changed paths: M ChangeLog M libraries/Config.class.php M libraries/common.inc.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: 7e0028e4afab115a89a18c1257c6132aa123fd25 https://github.com/phpmyadmin/phpmyadmin/commit/7e0028e4afab115a89a18c1257c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-06 (Mon, 06 Aug 2012) Changed paths: M ChangeLog M js/tbl_select.js M tbl_select.php Log Message: ----------- bug #3540922 [edit] Error searching table with many fields Commit: c4a5af9182cd8bb81717985ae908d029db1faabf https://github.com/phpmyadmin/phpmyadmin/commit/c4a5af9182cd8bb81717985ae90… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-08-06 (Mon, 06 Aug 2012) Changed paths: M ChangeLog M js/tbl_select.js M libraries/Config.class.php M libraries/TableSearch.class.php M libraries/common.inc.php M tbl_select.php Log Message: ----------- Merge branch 'QA_3_5' Conflicts: js/tbl_select.js po/da.po tbl_select.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/073c76aea2a6...c4a5af9182cd