gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,419 Commits 12 Branches 481 Tags 2.4 GiB
4b0dedbdbf
Commit Graph

11535 Commits

Author SHA1 Message Date
Madhura Jayaratne
04dc16e1fc Fix long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:33:15 +02:00
Madhura Jayaratne
af857f33bc Fix parameter name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:19:06 +02:00
Madhura Jayaratne
f487813356 Remove sperfluous doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:17:29 +02:00
Madhura Jayaratne
9079749206 Fix coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:12:03 +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
Madhura Jayaratne
348c51a5a3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-10 13:03:11 +02:00
Madhura Jayaratne
a5d0b1196c Fix yet another typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:02:55 +02:00
Madhura Jayaratne
553000a423 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:02:22 +02:00
Madhura Jayaratne
839094612a Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:00:26 +02:00
Marc Delisle
277c0c57db Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:58:37 +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
Michal Čihař
b8a879cef2 Document when the function is called 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:09:08 +02:00
Madhura Jayaratne
c93a2f8c0f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-10 12:06:19 +02:00
Madhura Jayaratne
d0fd5acc0f Revert 33a30ad7ae. Those funcitons are infact used. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 12:04:36 +02:00
Michal Čihař
cff38db7f2 Share code for rending correct page after export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:02:39 +02:00
Michal Čihař
e984b2a609 The ini_set function takes string, not booleans or integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:57:10 +02:00
Madhura Jayaratne
c154b1b9c5 Explicitly stating the visibility 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:54:49 +02:00
Madhura Jayaratne
33a30ad7ae These functions do not seem to be used anywhere, removing... 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:51:03 +02:00
Michal Čihař
72d180afd8 Add basic test for navigation tree 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
64cce57669 Fix Node self referencing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
f9d2cc0c31 Always initialize match variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
725073709c Use token directly for session 
There is no need to have intermediate global variable to store the token
once we have it in the session data.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
e5ddfc87dc Remove dead code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Madhura Jayaratne
aa3b6bf2b8 Fix some coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:19:32 +02:00
Madhura Jayaratne
0dc03cad1e Check whether message is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:49:26 +02:00
Madhura Jayaratne
eb96dc7003 This should be an array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:31:51 +02:00
Madhura Jayaratne
a53ded5d9e $cfgRelation is an array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:21:53 +02:00
Michal Čihař
1865f72f2f Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:45:33 +02:00
Michal Čihař
a56ec50fb2 Move code for geting navigation node icon into Node class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:42:53 +02:00
Michal Čihař
e320d423e2 Factor out tree walking into separate method to share the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:40:22 +02:00
Michal Čihař
e82c53f93d Move navigation node CSS class generation to Node object 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:34:37 +02:00
Michal Čihař
07b090bcd2 Revert "Simplify code for generating separators array" 
This reverts commit e3d93b7f8a.

The new code did not properly handle empty separator.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:19:37 +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
Marc Delisle
b288a1676a Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 18:12:57 +02:00
Michal Čihař
afe2279fc4 Avoid problems with undefined drizzle constants 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:49:05 +02:00
Michal Čihař
2f91d172ef Avoid duplicate flags 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:46:33 +02:00
Michal Čihař
a5f338fe2f Fix handling of favorite tables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:32:49 +02:00
Michal Čihař
b1915bade0 The storeResult needs mysqli lin parameter to operate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:29:56 +02:00
Michal Čihař
afe414102a Improve check for empty message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:02:48 +02:00
Michal Čihař
cb6b37f19d Remove extra spaces 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:57:45 +02:00
Michal Čihař
f159a39ff2 Handle cases when errno is set, but dbi does not return error message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:53:45 +02:00
Michal Čihař
bde44ed8e4 Separate function call formatting in backtrace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Michal Čihař
1d6e2e9479 Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Michal Čihař
38febf6daf Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Michal Čihař
d44c4d9a96 Properly report MySQL error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:12:06 +02:00
Michal Čihař
650e0512de Share code for getting error message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:05:36 +02:00
Michal Čihař
53eca3b2cb Share code for backtrace formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:44:41 +02:00
Michal Čihař
eb9a4b7771 Separate backtrace formatting from error handling 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:44:41 +02:00
Michal Čihař
82b4549176 Remove unused parameter of PMA_Util::cacheUnset 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:21:12 +02:00
Michal Čihař
b3700d3450 Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:18:06 +02:00