gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

Browse Source
This commit is contained in:
Weblate 2013-07-30 14:30:17 +02:00
commit 3c112edaf3
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.0.6.0 (not yet released)
- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
4.0.5.0 (not yet released)
- bug #3977 Not detected configuration storage

5
doc/require.rst
View File

@ -13,13 +13,10 @@ PHP
---
* You need PHP 5.2.0 or newer, with ``session`` support, the Standard PHP Library
(SPL) extension and JSON support.
(SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions.
* To support uploading of ZIP files, you need the PHP ``zip`` extension.
* For proper support of multibyte strings (eg. UTF-8, which is currently
the default), you should install the ``mbstring`` and ``ctype`` extensions.
* You need GD2 support in PHP to display inline thumbnails of JPEGs
("image/jpeg: inline") with their original aspect ratio.