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

903 Commits

Author SHA1 Message Date
Michal Čihař
b69fa1499f Bring back file inclustion, just remove version check from it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 17:08:19 +01:00
Michal Čihař
072ff0b38a Remove checks for PHP versions we no longer support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 16:08:47 +01:00
Michal Čihař
e4dfb159c4 Do not use global constant with class 
As this doesn't play well together. This fixes the PDF schema export.

Fixes #11849

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:24:48 +01:00
Michal Čihař
37004337ab Merge commit 'a478437e0ee4d74ec5036cb32e165da002303dd1' 2016-01-14 09:10:43 +01:00
Deven Bansod
3b8644318a Fix #11752 , analyse the grant strings to perform checks for privileges instead of running all the test queries on mysql db 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-08 16:48:57 +05:30
Marc Delisle
68f8adfd84 No letters for logical operators 
https://github.com/dseguy/clearPHP/blob/master/rules/no-letter-logical.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-05 17:17:43 -05:00
Michal Čihař
628b19283d Fix spacing of docstrings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:40:44 +01:00
Michal Čihař
049e62285c Fix spacing after . 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:33:13 +01:00
Michal Čihař
af258e8073 Fix spacing of comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:31:30 +01:00
Michal Čihař
ebda156932 The shared method has to be protected, not private 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:15:17 +01:00
Michal Čihař
a7bafe5a6c Share code for exporting routines and events to XML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:08:32 +01:00
Michal Čihař
5801e7a019 Share _getPaperSizeArray code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:57:34 +01:00
Michal Čihař
ca59f5046c Use new contructor for Group() objects 
This safes us next calls to setName and setText.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:26:52 +01:00
Michal Čihař
4975ef2bc2 Use new constructor for Item() objects 
This allows to directly set name and text.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:04:02 +01:00
Michal Čihař
1168ed61b4 Share code for routines export 
The exporting of functions and procedures is almost same.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 13:06:28 +01:00
Michal Čihař
c660edd057 Simplify code by removing parallel if statements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:53:18 +01:00
Michal Čihař
3c90f45020 Simplify shape record loading 
We can use foreach with reference to simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Michal Čihař
f4eb1a9b4f There is no need to reset() before foreach() 
The code is there since past when PHP 4 was still supported reset was
necessary.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 11:26:34 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Marc Delisle
49302ec644 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-04 07:40:11 -05:00
Michal Čihař
4d74053e3f Remove not used controluser support from PMA_importRunQuery 
This code was never executed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:29:51 +01:00
Marc Delisle
3f97698382 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 08:25:39 -05:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +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
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
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
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
Marc Delisle
2607023281 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-03 11:00:01 -05:00
Marc Delisle
9ee3931c09 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-03 10:43:10 -05:00
Marc Delisle
2f2b505a2e Fixes ##11711 Clarify the meaning of "Stand-in structure for view" in SQL export 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-02 10:44:14 -05:00
Michal Čihař
46a70dba88 Remove unused method (parent class defines it) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 13:54:04 +01:00
Marc Delisle
ab7942be89 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-29 07:29:32 -05:00
Deven Bansod
77f220cee5 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/plugins/auth/AuthenticationCookie.php
 2015-11-26 19:29:18 +05:30
Deven Bansod
8eb712579d Fixes #11693 : Flush privileges overusage - related to issue 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:25:18 +05:30
Marc Delisle
80f079e525 Clarify message because a table name can be the same as a database name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-17 08:14:36 -05:00
Hugues Peccatte
22d93ba92f Merge remote-tracking branch 'origin/master' into psr1_master 2015-11-15 17:08:12 +01:00
Marc Delisle
06a4c57da1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-09 05:39:17 -08:00
Hugues Peccatte
154a942145 Remove side effects in declaration files. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-27 18:56:40 +01:00
Madhura Jayaratne
abffc62a02 Merge branch 'QA_4_5' 2015-10-27 19:52:05 +11:00
Madhura Jayaratne
ac97a97cb8 Fix #11610, #11611 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 19:45:39 +11:00
Marc Delisle
8e666ec1b5 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-24 16:35:58 -04:00
Deven Bansod
223a7a5e4e Fix 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-25 04:27:56 +05:30
Hugues Peccatte
e1dd0a9f97 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-18 22:51:01 +02:00
Hugues Peccatte
37d2a661c0 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:49:49 +02:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
af7eaeb047 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 21:51:21 +02:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Hugues Peccatte
c0617bcd5f Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-03 15:14:47 +02:00