[BUGFIX] Require zend.multibyte 81/51181/2
authorStanislas Rolland <typo3@sjbr.ca>
Sat, 7 Jan 2017 16:41:14 +0000 (11:41 -0500)
committerStanislas Rolland <typo3@sjbr.ca>
Sat, 7 Jan 2017 16:44:56 +0000 (17:44 +0100)
SJBR\SrFreecap\Domain\Model\Font uses declare(encoding='ISO-8859-2')
which, since PHP 5.4, requires zend.multibyte to be set to On'.

Resolves: #79195
Change-Id: I8155b408c498924ceffb806d3ea68679a36c42cd
Reviewed-on: https://review.typo3.org/51181
Reviewed-by: Stanislas Rolland <typo3@sjbr.ca>
Tested-by: Stanislas Rolland <typo3@sjbr.ca>
ChangeLog
doc/manual.sxw
ext_tables.php

index cdfaf67..2ae0e5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Change composer name to sjbr/sr-freecap
        * Require TYPO3 CMS 7.6 LTS
+       * Resolves #79195: Require zend.multibyte
 
 2016-02-13  Stanislas Rolland  <typo(arobas)sjbr.ca>
 
index cb1410a..8269969 100644 (file)
Binary files a/doc/manual.sxw and b/doc/manual.sxw differ
index 7490d82..df04dd8 100644 (file)
@@ -7,26 +7,28 @@ if (TYPO3_MODE == 'BE' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) {
         */
        // GDlib is a requirement for the Font Maker module
        if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib']) {
-               // SJBR\SrFreecap\Domain\Model\Font uses declare(encoding='ISO-8859-2') which, since PHP 5.4 requires zend.multibyte to be set to On'.
+               // SJBR\SrFreecap\Domain\Model\Font uses declare(encoding='ISO-8859-2') which, since PHP 5.4, requires zend.multibyte to be set to On'.
                // However, this has to be set in php.ini, .htaccess, httpd.conf or .user.ini, because the setting zend.multibyte is of type PHP_INI_PERDIR
                // See http://php.net/manual/en/configuration.changes.modes.php
-               \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-                       'SJBR.' . $_EXTKEY,
-                       // Make module a submodule of 'tools'
-                       'tools',
-                       // Submodule key
-                       'FontMaker',
-                       // Position
-                       '',
-                       // An array holding the controller-action combinations that are accessible
-                       array(
-                               'FontMaker' => 'new,create'
-                       ),
-                       array(
-                               'access' => 'user,group',
-                               'icon' => 'EXT:' . $_EXTKEY . '/Resources/Public/Images/moduleicon.gif',
-                               'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf'
-                       )
-               );
+               if (ini_get('zend.multibyte')) {
+                       \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
+                               'SJBR.' . $_EXTKEY,
+                               // Make module a submodule of 'tools'
+                               'tools',
+                               // Submodule key
+                               'FontMaker',
+                               // Position
+                               '',
+                               // An array holding the controller-action combinations that are accessible
+                               array(
+                                       'FontMaker' => 'new,create'
+                               ),
+                               array(
+                                       'access' => 'user,group',
+                                       'icon' => 'EXT:' . $_EXTKEY . '/Resources/Public/Images/moduleicon.gif',
+                                       'labels' => 'LLL:EXT:' . $_EXTKEY . '/Resources/Private/Language/locallang_mod.xlf'
+                               )
+                       );
+               }
        }
 }
\ No newline at end of file