diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-24 23:02:57 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-24 23:02:57 +0200 |
| commit | 6111272568a732465c330597a068a048f6705ef9 (patch) | |
| tree | f8829dfb4c4ee566a69f91d397e74e74aec56dbd /installer/web.php | |
| parent | de28b0350e5d5bf6c3e1eb5a9531298b08fd7cba (diff) | |
| parent | f56d372629df5b08a30d0182d4e1e7c97a44d79f (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/comment/helpers/comment_installer.php
modules/gallery/models/item.php
Diffstat (limited to 'installer/web.php')
| -rw-r--r-- | installer/web.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/web.php b/installer/web.php index 61f26f7d..78784539 100644 --- a/installer/web.php +++ b/installer/web.php @@ -81,7 +81,7 @@ function oops($error) { function check_environment() { if (!function_exists("mysql_query") && !function_exists("mysqli_set_charset")) { - $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the the <a href=\"http://php.net/mysql\">MySQL</a> or the <a href=\"http://php.net/mysqli\">MySQLi</a> extension."; + $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the <a href=\"http://php.net/mysql\">MySQL</a> or the <a href=\"http://php.net/mysqli\">MySQLi</a> extension."; } if (!@preg_match("/^.$/u", utf8_encode("\xF1"))) { |