gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,546 Commits 12 Branches 481 Tags 2.4 GiB
3363f10880
Commit Graph

220 Commits

Author SHA1 Message Date
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Marc Delisle
8a3bf5af9f Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-20 13:14:05 -04:00
Madhura Jayaratne
00f2788a66 bug #4560 PHP error on master branch 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:35:16 +05:30
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Madhura Jayaratne
792224b92e Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 11:16:23 +05:30
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-03 23:08:43 +02:00
Hugues Peccatte
5926d94d87 Add include to use PMA mb_* functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 21:49:44 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Remi Collet
31792c8091 fix gettext include path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-22 11:33:59 +02:00
Hugues Peccatte
e28a833103 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-09-07 00:32:14 +02:00
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Marc Delisle
fde42eb2e8 No need to have a distinct file 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-06 14:11:04 -04:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
792a8d3244 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-30 07:01:35 -04:00
Remi Collet
4f352990dc fix gettext include path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-19 07:49:15 -04:00
Ashutosh Dhundhara
7a9569f6b5 RFE#1123: Zeroconf PMA tables support. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 18:33:59 +05:30
Marc Delisle
97273edddf Merge branch 'QA_4_2' 2014-07-18 11:48:02 -04:00
Remi Collet
7127ed28c9 Fix link in home page. 
Web site: url.php?url=http://www.phpMyAdmin.net/ => OK
Improve:  url.php?url=http://www.phpmyadmin.neti/home_page/improve.php => broken
Support:  url.php?url=http://www.phpmyadmin.net/home_page/support.php  => broken

As domain name are not case sensitive, this seems the simpler fix.
(other solution, fix index.php to use CamelCase names for all links)

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-18 11:38:42 -04:00
Chirayu Chiripal
1dd8d8c28c fix: error in export with option view output as text 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-19 17:30:50 +05:30
Michal Čihař
273de91741 Simplify code as zero length array is empty as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-09 10:20:01 +02:00
Ashutosh Dhundhara
99b9e8d83c RFE#1145: Preview SQL instead of executing it. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-07 00:27:39 +05:30
Ann + J.M
ddf78c212b Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-26 10:39:50 +02:00
Hugues Peccatte
b7b7e25fe0 Replace edit input for text fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-24 23:33:56 +02:00
Ann + J.M
69ddb29989 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:33:01 +02:00
Madhura Jayaratne
288c012128 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:05:12 +02:00
Marc Delisle
d12d752c8c Merge pull request #1171 from ashutoshdhundhara/rfe_1445 
RFE: #1445 Easy access to "SHOW CREATE".
 2014-05-10 12:54:27 +02:00
Ashutosh Dhundhara
cc9cef8e15 RFE: #1445 Easy access to "SHOW CREATE". 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-10 02:10:21 +05:30
Michal Čihař
0b2e35da19 Execute headers code when we have runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:53:14 +02:00
Michal Čihař
eba095262b Simplify array initialization 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:21:54 +02:00
Michal Čihař
66e2135fb3 Remove break after return 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:19:16 +02:00
Michal Čihař
295e688eaf Try to fix wrong stripping of request variables 
- the list of walked array keys can not be static as this can prevent of
  processing of some elements
- we need to flag all processed elements as after reordering they can
  come again
 2014-04-10 13:31:55 +02:00
Jeff Chan
896fe8169a Fix PMA_arrayWalkRecursive to ensure single pass thru keys 
Fix a bug with PMA_arrayWalkRecursive that causes it to apply a function
to its keys/values more than once. A previously incorrect test is fixed
as well.

The bug happens because when keys are modified, PHP's foreach loops
through the new keys again. This does not usually happen unless the
iterating array is passed through by reference (or has refcount=1).
See: http://stackoverflow.com/a/14854568/791890

Please see #936 for full explanation.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-02-17 03:09:34 +00:00
Madhura Jayaratne
61338c4859 Remove trailing whitespaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 12:38:37 +05:30
Marc Delisle
0034680de8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-07 12:45:24 -05:00
Dhananjay
0a18d86059 Fix for bug#4237. 
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
 2014-02-07 11:56:46 +05:30
Marc Delisle
dd7ddbfd78 Merge branch 'QA_4_1' 2013-12-31 09:03:24 -05:00
Jørgen Thomsen
ccd65816b8 bug #3840 (additional fix) When exporting to gzip format, the data is compresses 2 times 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-31 09:02:16 -05:00
Hugues Peccatte
008b1fa8d3 Rewrite to decrease number of nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-07 22:16:16 +01:00
Hugues Peccatte
2274453717 Minor PHPDoc modifications. 2013-12-07 19:00:53 +01:00
Marc Delisle
1a0eff3a9c Fix typos 2013-11-12 07:16:20 -05:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Madhura Jayaratne
184316d891 Coding style fixes 2013-11-03 19:00:41 +05:30
Piotr Przybylski
a67e41a646 Refactored ConfigFile class so that it is no longer a singleton 
Fixes bug #4123 Double config including
 2013-11-03 12:54:20 +01:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
ccc186e876 Load gettext without setup for errors 
This pulls in definition of other functions than __ so that any messages
would work.
 2013-08-06 15:07:35 +02:00
Michal Čihař
9310e76a0e Fix indentation 2013-07-30 13:23:51 +02:00
Marc Delisle
957a204c5a Fix typos 2013-07-23 07:12:44 -04:00
Michal Čihař
5e6d3eaa53 Whitespace cleanup 2013-06-11 08:59:58 +02:00
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30