New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling of databases with dot in a name #11815

Merged
merged 1 commit into from Jan 5, 2016

Conversation

Projects
None yet
2 participants
@nijel
Member

nijel commented Jan 4, 2016

We do not need to concatenate and parse the items, the cache backend
accepts array directly.

Fixes #11798

Signed-off-by: Michal Čihař michal@cihar.com

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Jan 4, 2016

Member

I could not test the changes right now, so the commit is completely untested...

Member

nijel commented Jan 4, 2016

I could not test the changes right now, so the commit is completely untested...

Fix handling of databases with dot in a name
We do not need to concatenate and parse the items, the cache backend
accepts array directly.

Fixes #11798

Signed-off-by: Michal Čihař <michal@cihar.com>
@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Jan 4, 2016

Member

I've fixed my test environment, and the patch seems to work fine. Still I'd like to hear feedback as this might look too intrusive for QA_4_5...

Member

nijel commented Jan 4, 2016

I've fixed my test environment, and the patch seems to work fine. Still I'd like to hear feedback as this might look too intrusive for QA_4_5...

@Achilles-96

This comment has been minimized.

Show comment
Hide comment
@Achilles-96

Achilles-96 Jan 4, 2016

Contributor

@nijel In https://github.com/phpmyadmin/phpmyadmin/blob/QA_4_5/libraries/util.lib.php#L27, as $path will be an array, I think explode can be removed.

Contributor

Achilles-96 commented Jan 4, 2016

@nijel In https://github.com/phpmyadmin/phpmyadmin/blob/QA_4_5/libraries/util.lib.php#L27, as $path will be an array, I think explode can be removed.

@nijel

This comment has been minimized.

Show comment
Hide comment
@nijel

nijel Jan 4, 2016

Member

@Achilles-96 The explode is used only if it's not an array and there are still some places where the string is used in call to Util\\get, but with safe values (eg. libraries/controllers/TableStructureController.class.php).

Member

nijel commented Jan 4, 2016

@Achilles-96 The explode is used only if it's not an array and there are still some places where the string is used in call to Util\\get, but with safe values (eg. libraries/controllers/TableStructureController.class.php).

@nijel nijel self-assigned this Jan 5, 2016

nijel added a commit that referenced this pull request Jan 5, 2016

Merge pull request #11815 from nijel/dot-database
Fix handling of databases with dot in a name

@nijel nijel merged commit 912f961 into phpmyadmin:QA_4_5 Jan 5, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@nijel nijel deleted the nijel:dot-database branch Jan 5, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment