mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-19 04:41:25 +02:00
Code Issues Releases Wiki Activity

Rename functions (avoid conflict with WordPress)

Browse Source
This commit is contained in:
Jakub Vrana
2010-10-16 15:47:51 +02:00
parent 207673f06c
commit 1cf374bf48
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/include/functions.inc.php
View File

@@ -730,7 +730,7 @@ function password_file() {
* @param string
* @return bool
*/
function is_email($email) {
function is_mail($email) {
$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
$pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain";

4
adminer/select.inc.php
View File

@@ -279,7 +279,7 @@ if (!$columns) {
if (isset($names[$key])) {
$field = $fields[$key];
if ($val != "" && (!isset($email_fields[$key]) || $email_fields[$key] != "")) {
$email_fields[$key] = (is_email($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages
$email_fields[$key] = (is_mail($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages
}
$link = "";
$val = $adminer->editVal($val, $field);
@@ -322,7 +322,7 @@ if (!$columns) {
}
}
if (!$link) {
if (is_email($val)) {
if (is_mail($val)) {
$link = "mailto:$val";
}
if ($protocol = is_url($row[$key])) {