Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 45b538b1ec27da10b5748949dc36863772b6cc33 https://github.com/phpmyadmin/phpmyadmin/commit/45b538b1ec27da10b5748949dc36... Author: Vasu Bhardwaj voodoorapter014@gmail.com Date: 2014-02-08 (Sat, 08 Feb 2014)

Changed paths: M libraries/navigation/Nodes/Node.class.php

Log Message: ----------- Fix For Wildcard-containing only_db failure in sidebar

This commit fixes the Bug #4242. The "only_db"directive now accepts MySQL LIKE wildcards without errors.Changes have been made to the function getData() in phpmyadmin/libraries/navigation/Nodes/Node.class.php . The if-else clause has been removed. The checking of the "only_db" directive is now performed solely by the function getWhereClause()in the same class.

Signed-off-by: Vasu Bhardwaj voodoorapter014@gmail.com

Commit: a3504f418561909c29e8c7ac57a9d3d3f5782787 https://github.com/phpmyadmin/phpmyadmin/commit/a3504f418561909c29e8c7ac57a9... Author: Marc Delisle marc@infomarc.info Date: 2014-02-09 (Sun, 09 Feb 2014)

Changed paths: M libraries/navigation/Nodes/Node.class.php

Log Message: ----------- Merge pull request #904 from Vasu014/bug4242

Fix For Wildcard-containing only_db failure in sidebar

Commit: b9197e1dfd6cac1cf04a480a562284fa9e4643e9 https://github.com/phpmyadmin/phpmyadmin/commit/b9197e1dfd6cac1cf04a480a5622... Author: Marc Delisle marc@infomarc.info Date: 2014-02-09 (Sun, 09 Feb 2014)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry for fix of bug #4242

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 4fc9aed58220706a74648d29b6c13397d0e72891 https://github.com/phpmyadmin/phpmyadmin/commit/4fc9aed58220706a74648d29b6c1... Author: Marc Delisle marc@infomarc.info Date: 2014-02-09 (Sun, 09 Feb 2014)

Changed paths: M libraries/navigation/Nodes/Node.class.php

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: e8c1b42374aacd518b3b0914e90ed67be4badf45 https://github.com/phpmyadmin/phpmyadmin/commit/e8c1b42374aacd518b3b0914e90e... Author: Marc Delisle marc@infomarc.info Date: 2014-02-09 (Sun, 09 Feb 2014)

Log Message: ----------- Merge commit 'a3504f4'

Commit: 5c213ec88937545428b215007f057636e5ce3c55 https://github.com/phpmyadmin/phpmyadmin/commit/5c213ec88937545428b215007f05... Author: Marc Delisle marc@infomarc.info Date: 2014-02-09 (Sun, 09 Feb 2014)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f60b0c92d031...5c213ec88937