Remove unused local variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Fix PHPCS issues.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Refactor code in ImportMediawiki.class.php.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Minor test update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Remove unused parameters.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Fix typos.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Fix token error on Status menu items

Remove a '?' missed from a540e6ba878bae1fc352fadb8aad278a69f17365

Signed-off-by: Daniel Rix <drainx1@live.com>
Merge branch 'master' into Performance

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge pull request #1385 from drainx/master

Fix token error on Status menu items
Fix Status->All status variables to display correct suffix and formatting.

Broken by f9cd1a1a227d193dc8a70decb8e59607deb3e165

Signed-off-by: Daniel Rix <drainx1@live.com>
Fix test failures

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge pull request #1381 from madhuracj/Performance

Minor performance improvements
Configure timezone for Travis tests

Otherwise date related tests in HHVM fail.

Signed-off-by: Michal Čihař <michal@cihar.com>
Translated using Weblate (English (United Kingdom))

Currently translated at 91.2% (2713 of 2973 strings)

[CI skip]
Merge remote-tracking branch 'origin/master'
Split up Travis PHP config snippets

We want to se timezone always, but runkit is available only for some
versions.

Signed-off-by: Michal Čihař <michal@cihar.com>
Add runkit support for PHP 5.6

Signed-off-by: Michal Čihař <michal@cihar.com>
This patch works only for 5.6

Signed-off-by: Michal Čihař <michal@cihar.com>
Revert "Split up Travis PHP config snippets"

This reverts commit 6cd819a92efaf0c9124a92045c180f96d0b15aa4.