gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,863 Commits 12 Branches 481 Tags 2.4 GiB
0eca09ffff
Commit Graph

5481 Commits

Author SHA1 Message Date
Piotr Przybylski
0eca09ffff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/dbi/mysqli.dbi.lib.php
 2011-07-27 20:10:38 +02:00
Piotr Przybylski
e82682d0e4 Simplify PMA_DBI_free_result 
It was never used with multiple arguments
 2011-07-27 19:59:49 +02:00
Piotr Przybylski
b9ff7b7ce2 Support persistent connections with mysqli extension (only PHP 5.3.0 and newer) 2011-07-27 19:59:49 +02:00
Piotr Przybylski
f43517efb5 mysql extension - remove 'persistent' parameter 
Was named 'persistant' and never used/documented
 2011-07-27 19:59:49 +02:00
Piotr Przybylski
46cd0f9a09 Comments 2011-07-27 19:59:49 +02:00
Piotr Przybylski
b0ce7c20c4 Improve readability 2011-07-27 19:59:48 +02:00
Piotr Przybylski
69ac509584 This should be checked in common, not in dbi library 2011-07-27 19:59:48 +02:00
Piotr Przybylski
2141b5fe81 Fix incorrect variable name 
persistant > persistent
 2011-07-27 19:59:48 +02:00
Piotr Przybylski
f2935d56d9 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	server_status.php
 2011-07-25 21:55:16 +02:00
Michal Čihař
3638bbd345 Fix typo 2011-07-25 14:46:33 +02:00
Michal Čihař
ffe203b099 Simplify definition of new valid links 2011-07-25 14:38:05 +02:00
Michal Čihař
765d823bbd Better function names 2011-07-25 14:35:52 +02:00
Michal Čihař
2cc790bad2 Coding style 2011-07-25 14:34:44 +02:00
Michal Čihař
c44b0eacec Fix docblocks 2011-07-25 14:32:09 +02:00
Michal Čihař
8d589ed83e Fix matching of tags without target 2011-07-25 14:12:22 +02:00
Michal Čihař
0c57cb20e2 Use preg_replace_callback for interpreting [a@...] 
This way we need to evaluate regullar expression only once and can
convert all correct links rather than replacing none in case one string
is broken.
 2011-07-25 14:05:57 +02:00
Michal Čihař
55c6412e6c Add documentation 2011-07-25 13:56:19 +02:00
Michal Čihař
a4807a8e7c Improve check for valid links 2011-07-25 13:54:09 +02:00
Michal Čihař
17cd1ebe2b Use single function for bbcode implementation 2011-07-25 12:11:17 +02:00
Michal Čihař
c3daf8bc52 Wrap long lines and make it more readable 2011-07-25 11:53:02 +02:00
Michal Čihař
f34dfda0fe Merge remote-tracking branch 'tyron/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	js/sql.js
	libraries/common.lib.php
	server_status.php
	themes/pmahomme/css/theme_left.css.php
 2011-07-25 11:32:22 +02:00
Marc Delisle
35a5f31283 Merge branch 'QA_3_4' 2011-07-24 08:08:51 -04:00
Marc Delisle
08ee54d4a4 bug #3358750 [core] With Suhosin, urls are too long in edit links 2011-07-24 08:08:38 -04:00
Piotr Przybylski
e94e42fb73 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-23 23:33:19 +02:00
Marc Delisle
7e197b695e Fix merge conflicts 2011-07-23 08:25:49 -04:00
Marc Delisle
3534dda30a Fix merge conflicts 2011-07-23 08:16:00 -04:00
Tyron Madlener
ace73f25bb - Added missing CSS Sprites, Icon sprites now also for PMA_linkOrButton() 
- Rewrote PMA_linkOrButton() to rely on Javascript, making the code way less complicated
- Removed legacy support of Javascript 1.1 or lower
- Fixed a bug in cases where PMA_linkOrButton() creates a form, which when clicked required a js confirm, the confirm is being displayed a second time after the form is submitted.
 2011-07-23 09:23:18 +03:00
Marc Delisle
c968408de7 Merge branch 'QA_3_4' 2011-07-22 09:35:51 -04:00
Sven Strickroth
201ad07ea8 Do not add backquotes for normal displayed text 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-07-22 09:33:30 -04:00
Michal Čihař
4a80c3e62d Merge remote-tracking branch 'origin/QA_3_4' 2011-07-22 15:17:25 +02:00
Sven Strickroth
54398f8a12 Do not call PMA_showHint with bbcode=true in display_tbl.lib.php 
This fixes an issue with an InnoDB-table on sql.php with "select * from tbl" showing that "total ~ N <sup>1</sup>" rows are displayed and with a JavaScript enabled browser the footnote gets hidden and it's impossible to find out what the <sup>1</sup> means.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-07-22 15:16:13 +02:00
Piotr Przybylski
13f0d7a5d5 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-22 14:13:11 +02:00
Piotr Przybylski
2dee226c50 Add missing HTML escaping 2011-07-22 14:11:59 +02:00
Piotr Przybylski
a7fe9db581 Change strings 2011-07-22 14:09:57 +02:00
Piotr Przybylski
a04f592a92 Don't use DEFAULT CHARACTER SET when creating tables during import (Drizzle) 2011-07-22 13:39:23 +02:00
Michal Čihař
60fdffbafa Merge remote-tracking branch 'rouslan/rte' 2011-07-22 11:56:33 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Tyron Madlener
9ee8ff38c3 Replaced qtTip js library with non-minified version. 2011-07-22 11:41:13 +03:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
3f8badd37f Replace tabs with spaces, cleanup identation 2011-07-22 09:53:41 +02:00
Michal Čihař
b8d5cee5d7 Fix indentation 2011-07-22 09:39:00 +02:00
Michal Čihař
bf9def5d50 Wrap some long lines 2011-07-22 09:29:41 +02:00
Michal Čihař
6b75d60e91 Document that this is IPv4 only 2011-07-22 09:27:49 +02:00
Michal Čihař
236582fb4f Fix mistakenly broken regexp 2011-07-22 09:25:14 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Piotr Przybylski
b364cfd211 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-21 22:56:21 +02:00
Rouslan Placella
eed246438e Merge branch 'master' into rte 2011-07-21 20:11:24 +01:00
Rouslan Placella
49b2ca984a No need to show a "table" column in the list of triggers, if a table is already selected. 2011-07-21 20:07:59 +01:00