gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,062 Commits 12 Branches 481 Tags 2.4 GiB
18cfc24743
Commit Graph

15287 Commits

Author SHA1 Message Date
Michal Čihař
18cfc24743 Display results of execute statement 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:22:34 +01:00
Michal Čihař
445e211645 Make parser understand DEALLOCATE 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:08:23 +01:00
Michal Čihař
23cfa82654 Merge pull request #11746 from Achilles-96/Issue-11730 
Fixes #11730
 2015-12-14 15:55:06 +01:00
Achilles-96
f48b5af23c Fixes #11730 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-14 10:35:29 +05:30
Marc Delisle
0a9bdc1619 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 19:41:55 -05:00
Marc Delisle
5a77115ac5 Merge pull request #11738 from Achilles-96/QA_4_5 
Fixes #11679
 2015-12-13 19:37:52 -05:00
Achilles-96
4b8983028a Fixes #11679 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-14 00:31:09 +05:30
Marc Delisle
3f97698382 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 08:25:39 -05:00
Marc Delisle
86769cafaa Use more modern statement 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-12 07:40:58 -05:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Hugues Peccatte
f04a678bad Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:16:13 +01:00
Hugues Peccatte
eda2816c70 Replace font tags by span. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:04:12 +01:00
Hugues Peccatte
9f97786e9b Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:22:21 +01:00
Marc Delisle
5a6d9c010b Undefined property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-11 09:27:31 -05:00
Madhura Jayaratne
1c7282b859 Merge branch 'QA_4_5' 
Conflicts:
	test/classes/plugin/export/ExportSqlTest.php
 2015-12-11 19:26:26 +11:00
Madhura Jayaratne
ceeec424d7 #11728 CSV import skip row count after 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:00:38 +11:00
Madhura Jayaratne
dcdd08a043 No need to break line here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:32:50 +11:00
Madhura Jayaratne
fd0f3d4264 Merge branch 'QA_4_5' 2015-12-11 16:29:12 +11:00
Madhura Jayaratne
f0aba98e35 Fix #11732 Exporting feature does not work with union table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:24:58 +11:00
Michal Čihař
5d41e54e1c Remove not used TypesDrizzle.php 
The support for Drizzle has been already removed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:43:13 +01:00
Michal Čihař
1a47ee0641 No need for unset() as we are not in global context 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:37:51 +01:00
Michal Čihař
7de390f26a Move theme initialization to ThemeManager 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:34:09 +01:00
Michal Čihař
1deac94062 Move PHP extensions check to separate function 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:24:41 +01:00
Michal Čihař
c4cdd16342 Move PATH_INFO cleanup to function 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:22:03 +01:00
Michal Čihař
3565e4db79 Remove PMA_arrayMergeRecursive 
It can be replaced with array_replace_recursive as of PHP 5.3, we
require PHP 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:06:00 +01:00
Michal Čihař
95d10b8c1f Remove PMA_prettyPrint 
It is no longer needed as JSON_PRETTY_PRINT is there since PHP 5.4 (and
we require 5.5).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:54:36 +01:00
Michal Čihař
4d9dc457bd Update comment to match current requirements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:50:54 +01:00
Michal Čihař
7facd526b1 Remove code for PHP < 5.4 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:50:02 +01:00
Michal Čihař
06bb1e67f2 Remove PMA_arrayWalkRecursive 
For the single remaining use case native array_walk_recursive is good
enoug.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:42:13 +01:00
Michal Čihař
7181f2d22d Remove magic_quotes_gpc handling 
This has been removed in PHP 5.4.0 and we support 5.5.0 or newer only.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:36:34 +01:00
Madhura Jayaratne
964787243e Update doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 09:30:19 +11:00
Madhura Jayaratne
aabcf643cb Fix bug - Buffer pool and InnoDB status details are not shown for InnoDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 08:53:48 +11:00
Madhura Jayaratne
8880039561 Merge pull request #11729 from madhuracj/engines 
Refactor Engines Page
 2015-12-09 08:41:23 +11:00
Madhura Jayaratne
19f86d9df6 Fix more tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 07:29:27 +11:00
Marc Delisle
3088308641 Remove side effects in declaration files. 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 15:13:27 -05:00
Marc Delisle
a26c4a10f4 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 15:10:11 -05:00
Marc Delisle
cc6e4f560b Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 15:08:40 -05:00
Marc Delisle
c7ec8d7240 Move code to a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 12:15:33 -05:00
Madhura Jayaratne
05a2e0305e Pass the engine to the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 11:06:18 +11:00
Madhura Jayaratne
45f11c4bb5 Template engine details page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 10:32:42 +11:00
Madhura Jayaratne
9a40624d17 Template engines list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 09:02:38 +11:00
Madhura Jayaratne
aa2f9c444a Add a controller for server engines page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 08:50:18 +11:00
Michal Čihař
3da8853467 Merge branch 'QA_4_5' 2015-12-07 16:39:31 +01:00
Michal Čihař
b96aa8ff94 Avoid duplicite fetching of table information 
We already have that, so there is no need to issue the query
again.

Fixes #11714

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:39:11 +01:00
Michal Čihař
b94318c4cd Merge branch 'QA_4_5' 2015-12-07 15:37:08 +01:00
Michal Čihař
8742209c63 Fix single quote export for servers in ANSI_QUOTES mode 
It is possible to escape ' inside '' as both '' and \'. However using ''
is MySQL extension and does not work in ANSI mode. We need to generate
compatible exports in this case, so sticking with \' is safer.

Fixes #11721

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 15:33:37 +01:00
Marc Delisle
d9bec7f085 HTML line break shown after a MySQL connection error message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:02:07 -05:00
Marc Delisle
66c15daba0 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:01:07 -05:00
Marc Delisle
3dcb36b4ca Apparently, variable interpolation also suffers from an unneeded memory copy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 07:40:20 -05:00
Marc Delisle
357b1b4757 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-04 09:05:42 -05:00