Merge remote-tracking branch 'origin/master'
This commit is contained in:
Weblate
commit
3f3b17c062
@ -50,10 +50,6 @@ if (@is_readable($filename)) {
|
||||
*/
|
||||
$changelog = htmlspecialchars($changelog);
|
||||
|
||||
$tracker_url = 'https://sourceforge.net/support/tracker.php?aid=\\1';
|
||||
$tracker_url_bug = 'https://sourceforge.net/p/phpmyadmin/bugs/\\1/';
|
||||
$tracker_url_rfe = 'https://sourceforge.net/p/phpmyadmin/feature-requests/\\1/';
|
||||
$tracker_url_patch = 'https://sourceforge.net/p/phpmyadmin/patches/\\1/';
|
||||
$github_url = 'https://github.com/phpmyadmin/phpmyadmin/';
|
||||
$faq_url = 'https://docs.phpmyadmin.net/en/latest/faq.html';
|
||||
|
||||
@ -61,53 +57,18 @@ $replaces = array(
|
||||
'@(https?://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'
|
||||
=> '<a href="url.php?url=\\1">\\1</a>',
|
||||
|
||||
// sourceforge users
|
||||
'/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +<(.*)@users.sourceforge.net>/i'
|
||||
=> '\\1 <a href="url.php?url=https://sourceforge.net/users/\\3/">\\2</a>',
|
||||
'/thanks to ([^\(\r\n]+) \(([-\w]+)\)/i'
|
||||
=> 'thanks to <a href="url.php?url=https://sourceforge.net/users/\\2/">\\1</a>',
|
||||
'/thanks to ([^\(\r\n]+) -\s+([-\w]+)/i'
|
||||
=> 'thanks to <a href="url.php?url=https://sourceforge.net/users/\\2/">\\1</a>',
|
||||
|
||||
// mail address
|
||||
'/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +<(.*@.*)>/i'
|
||||
=> '\\1 <a href="mailto:\\3">\\2</a>',
|
||||
|
||||
// linking patches
|
||||
'/patch\s*#?([0-9]{6,})/i'
|
||||
=> '<a href="url.php?url=' . $tracker_url . '">patch #\\1</a>',
|
||||
|
||||
// linking RFE
|
||||
'/(?:rfe|feature)\s*#?([0-9]{6,})/i'
|
||||
=> '<a href="url.php?url=https://sourceforge.net/support/tracker.php?aid=\\1">RFE #\\1</a>',
|
||||
|
||||
// FAQ entries
|
||||
'/FAQ ([0-9]+)\.([0-9a-z]+)/i'
|
||||
=> '<a href="url.php?url=' . $faq_url . '#faq\\1-\\2">FAQ \\1.\\2</a>',
|
||||
|
||||
// linking bugs
|
||||
'/bug\s*#?([0-9]{6,})/i'
|
||||
=> '<a href="url.php?url=https://sourceforge.net/support/tracker.php?aid=\\1">bug #\\1</a>',
|
||||
|
||||
// all other 6+ digit numbers are treated as bugs
|
||||
'/(?<!bug|RFE|patch) #?([0-9]{6,})/i'
|
||||
=> '<a href="url.php?url=' . $tracker_url . '">bug #\\1</a>',
|
||||
|
||||
// GitHub issues
|
||||
'/issue\s*#?([0-9]{4,5}) /i'
|
||||
=> '<a href="url.php?url=' . $github_url . 'issues/\\1">issue #\\1</a> ',
|
||||
|
||||
// transitioned SF.net project bug/rfe/patch links
|
||||
// by the time we reach 6-digit numbers, we can probably retire the above links
|
||||
'/patch\s*#?([0-9]{4,5}) /i'
|
||||
=> '<a href="url.php?url=' . $tracker_url_patch . '">patch #\\1</a> ',
|
||||
'/(?:rfe|feature)\s*#?([0-9]{4,5}) /i'
|
||||
=> '<a href="url.php?url=' . $tracker_url_rfe . '">RFE #\\1</a> ',
|
||||
'/bug\s*#?([0-9]{4,5}) /i'
|
||||
=> '<a href="url.php?url=' . $tracker_url_bug . '">bug #\\1</a> ',
|
||||
'/(?<!bug|RFE|patch) #?([0-9]{4,5}) /i'
|
||||
=> '<a href="url.php?url=' . $tracker_url_bug . '">bug #\\1</a> ',
|
||||
|
||||
// CVE/CAN entries
|
||||
'/((CAN|CVE)-[0-9]+-[0-9]+)/'
|
||||
=> '<a href="url.php?url=https://cve.mitre.org/cgi-bin/cvename.cgi?name=\\1">\\1</a>',
|
||||
|
||||
@ -1038,8 +1038,8 @@ class Descriptions
|
||||
return __('Hide databases matching regular expression (PCRE).');
|
||||
case 'Servers_DisableIS_desc':
|
||||
return __(
|
||||
'More information on [a@https://sourceforge.net/p/phpmyadmin/bugs/2606/]PMA '
|
||||
. 'bug tracker[/a] and [a@https://bugs.mysql.com/19588]MySQL Bugs[/a]'
|
||||
'More information on [a@https://github.com/phpmyadmin/phpmyadmin/issues/8970]phpMyAdmin '
|
||||
. 'issue tracker[/a] and [a@https://bugs.mysql.com/19588]MySQL Bugs[/a]'
|
||||
);
|
||||
case 'Servers_DisableIS_name':
|
||||
return __('Disable use of INFORMATION_SCHEMA');
|
||||
|
||||
@ -800,8 +800,6 @@ class Core
|
||||
/* php.net domains */
|
||||
'php.net',
|
||||
'secure.php.net',
|
||||
/* sourceforge.net domain */
|
||||
'sourceforge.net',
|
||||
/* Github domains*/
|
||||
'github.com','www.github.com',
|
||||
/* Percona domains */
|
||||
|
||||
@ -769,8 +769,7 @@ class DatabaseInterface
|
||||
// MySQL returns
|
||||
// with SHOW DATABASES or information_schema.SCHEMATA: `Test`
|
||||
// but information_schema.TABLES gives `test`
|
||||
// bug #2036
|
||||
// https://sourceforge.net/p/phpmyadmin/bugs/2036/
|
||||
// see https://github.com/phpmyadmin/phpmyadmin/issues/8402
|
||||
return $tables[mb_strtolower($database)];
|
||||
}
|
||||
|
||||
|
||||
@ -456,7 +456,7 @@ class DbiMysqli implements DbiExtension
|
||||
// MySQL returns MYSQLI_TYPE_STRING for CHAR
|
||||
// and MYSQLI_TYPE_CHAR === MYSQLI_TYPE_TINY
|
||||
// so this would override TINYINT and mark all TINYINT as string
|
||||
// https://sourceforge.net/p/phpmyadmin/bugs/2205/
|
||||
// see https://github.com/phpmyadmin/phpmyadmin/issues/8569
|
||||
//$typeAr[MYSQLI_TYPE_CHAR] = 'string';
|
||||
$typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry';
|
||||
$typeAr[MYSQLI_TYPE_BIT] = 'bit';
|
||||
|
||||
@ -3923,7 +3923,7 @@ class Privileges
|
||||
if (! $GLOBALS['dbi']->tryQuery($sql_query0)) {
|
||||
// This might fail when the executing user does not have
|
||||
// ALL PRIVILEGES himself.
|
||||
// See https://sourceforge.net/p/phpmyadmin/bugs/3270/
|
||||
// See https://github.com/phpmyadmin/phpmyadmin/issues/9673
|
||||
$sql_query0 = '';
|
||||
}
|
||||
if (! empty($sql_query1) && ! $GLOBALS['dbi']->tryQuery($sql_query1)) {
|
||||
|
||||
@ -1546,7 +1546,7 @@ class Util
|
||||
|
||||
$ret = strftime($date, $timestamp);
|
||||
// Some OSes such as Win8.1 Traditional Chinese version did not produce UTF-8
|
||||
// output here. See https://sourceforge.net/p/phpmyadmin/bugs/4207/
|
||||
// output here. See https://github.com/phpmyadmin/phpmyadmin/issues/10598
|
||||
if (mb_detect_encoding($ret, 'UTF-8', true) != 'UTF-8') {
|
||||
$ret = date('Y-m-d H:i:s', $timestamp);
|
||||
}
|
||||
|
||||
@ -554,7 +554,7 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array();
|
||||
/**
|
||||
* Disable use of INFORMATION_SCHEMA.
|
||||
*
|
||||
* @see https://sourceforge.net/p/phpmyadmin/bugs/2606/
|
||||
* @see https://github.com/phpmyadmin/phpmyadmin/issues/8970
|
||||
* @see https://bugs.mysql.com/19588
|
||||
* @global boolean $cfg['Servers'][$i]['DisableIS']
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
