From 06ad3389e0f43d856a89c59dff340fd561982ea2 Mon Sep 17 00:00:00 2001 From: Lennart Hildebrandt Date: Thu, 20 Sep 2012 13:11:09 +0200 Subject: [PATCH 1/2] Added .idea for PhpStorm contributers --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2091122d0..59cd005a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ en/_exts/configurationblock.pyc build en/_build +.idea From a61afedcf9e65e26c6ea658b77778b30691995f2 Mon Sep 17 00:00:00 2001 From: Lennart Hildebrandt Date: Thu, 20 Sep 2012 13:11:36 +0200 Subject: [PATCH 2/2] Fixed typo for mapping type "array" --- en/reference/basic-mapping.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/reference/basic-mapping.rst b/en/reference/basic-mapping.rst index 932fdb417..64f670840 100644 --- a/en/reference/basic-mapping.rst +++ b/en/reference/basic-mapping.rst @@ -164,7 +164,7 @@ built-in mapping types: - ``text``: Type that maps an SQL CLOB to a PHP string. - ``object``: Type that maps a SQL CLOB to a PHP object using ``serialize()`` and ``unserialize()`` -- ``array``: Type that maps a SQL CLOB to a PHP object using +- ``array``: Type that maps a SQL CLOB to a PHP array using ``serialize()`` and ``unserialize()`` - ``float``: Type that maps a SQL Float (Double Precision) to a PHP double. *IMPORTANT*: Works only with locale settings that use