From 59e56bd63a5e023b797d82eb272cd074e3b4bfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 29 Apr 2016 15:36:54 +0200 Subject: [PATCH] Pass link to demo server through url.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- index.php | 2 +- libraries/core.lib.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 62f1d24a07..bb4ce18343 100644 --- a/index.php +++ b/index.php @@ -152,7 +152,7 @@ if ($server > 0 || count($cfg['Servers']) > 1 . 'please do not change root, debian-sys-maint and pma users. ' . 'More information is available at %s.' ), - 'demo.phpmyadmin.net' + 'demo.phpmyadmin.net' ); echo '

'; echo ''; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index aed40964e8..56548727ad 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -762,6 +762,7 @@ function PMA_isAllowedDomain($url) $_SERVER['SERVER_NAME'], /* phpMyAdmin domains */ 'wiki.phpmyadmin.net', 'www.phpmyadmin.net', 'phpmyadmin.net', + 'demo.phpmyadmin.net', 'docs.phpmyadmin.net', /* mysql.com domains */ 'dev.mysql.com','bugs.mysql.com',