diff --git a/kernel/class/ezclassfunctioncollection.php b/kernel/class/ezclassfunctioncollection.php
index fb1534ba89a..215d770fc01 100644
--- a/kernel/class/ezclassfunctioncollection.php
+++ b/kernel/class/ezclassfunctioncollection.php
@@ -28,13 +28,13 @@ function fetchClassListByGroups( $groupFilter, $groupFilterType = 'include' )
             $classNameFilter = eZContentClassName::sqlFilter( 'cc' );
             $version = eZContentClass::VERSION_STATUS_DEFINED;
 
-            $sql = "SELECT DISTINCT cc.*, $classNameFilter[nameField] " .
-                   "FROM ezcontentclass cc, ezcontentclass_classgroup ccg, $classNameFilter[from] " .
-                   "WHERE cc.version = $version" .
+            $sql = "SELECT DISTINCT cc.*, {$classNameFilter['nameField']} " .
+                   "FROM ezcontentclass cc, ezcontentclass_classgroup ccg, {$classNameFilter['from']} " .
+                   "WHERE cc.version = {$version}" .
                    "      AND cc.id = ccg.contentclass_id" .
-                   "      AND $groupFilter" .
-                   "      AND $classNameFilter[where] " .
-                   "ORDER BY $classNameFilter[nameField] ASC";
+                   "      AND {$groupFilter}" .
+                   "      AND {$classNameFilter['where']} " .
+                   "ORDER BY {$classNameFilter['nameField']} ASC";
 
             $rows = $db->arrayQuery( $sql );
             $classes = eZPersistentObject::handleRows( $rows, 'eZContentClass', true );
diff --git a/kernel/classes/ezcache.php b/kernel/classes/ezcache.php
index 76037375ad9..cd969021525 100644
--- a/kernel/classes/ezcache.php
+++ b/kernel/classes/ezcache.php
@@ -492,13 +492,13 @@ static function clearItem( $cacheItem, $purge = false, $reporter = false, $itera
             if ( is_callable( $function ) )
                 call_user_func_array( $function, array( $cacheItem ) );
             else
-                eZDebug::writeError("Could not call cache item $functionName for id '$cacheItem[id]', is it a static public function?", __METHOD__ );
+                eZDebug::writeError("Could not call cache item {$functionName} for id '{$cacheItem['id']}', is it a static public function?", __METHOD__ );
         }
         else
         {
             if ( !isset( $cacheItem['path'] ) || strlen( $cacheItem['path'] ) < 1 )
             {
-                eZDebug::writeError( "No path specified for cache item '$cacheItem[name]', can not clear cache.", __METHOD__ );
+                eZDebug::writeError( "No path specified for cache item '{$cacheItem['name']}', can not clear cache.", __METHOD__ );
                 return;
             }
 
diff --git a/kernel/classes/ezcontentclass.php b/kernel/classes/ezcontentclass.php
index 9d8aa49e773..582757e0d30 100644
--- a/kernel/classes/ezcontentclass.php
+++ b/kernel/classes/ezcontentclass.php
@@ -518,11 +518,11 @@ static function canInstantiateClassList( $asObject = false, $includeFilter = tru
         if ( $fetchAll )
         {
             // If $asObject is true we fetch all fields in class
-            $fields = $asObject ? "cc.*, $classNameFilter[nameField]" : "cc.id, $classNameFilter[nameField]";
-            $rows = $db->arrayQuery( "SELECT DISTINCT $fields " .
-                                     "FROM ezcontentclass cc$filterTableSQL, $classNameFilter[from] " .
+            $fields = $asObject ? "cc.*, {$classNameFilter['nameField']}" : "cc.id, {$classNameFilter['nameField']}";
+            $rows = $db->arrayQuery( "SELECT DISTINCT {$fields} " .
+                                     "FROM ezcontentclass cc{$filterTableSQL}, {$classNameFilter['from']} " .
                                      "WHERE cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL " .
-                                     "ORDER BY $classNameFilter[nameField] ASC" );
+                                     "ORDER BY {$classNameFilter['nameField']} ASC" );
             $classList = eZPersistentObject::handleRows( $rows, 'eZContentClass', $asObject );
         }
         else
@@ -535,12 +535,12 @@ static function canInstantiateClassList( $asObject = false, $includeFilter = tru
 
             $classIDCondition = $db->generateSQLINStatement( $classIDArray, 'cc.id' );
             // If $asObject is true we fetch all fields in class
-            $fields = $asObject ? "cc.*, $classNameFilter[nameField]" : "cc.id, $classNameFilter[nameField]";
-            $rows = $db->arrayQuery( "SELECT DISTINCT $fields " .
-                                     "FROM ezcontentclass cc$filterTableSQL, $classNameFilter[from] " .
+            $fields = $asObject ? "cc.*, {$classNameFilter['nameField']}" : "cc.id, {$classNameFilter['nameField']}";
+            $rows = $db->arrayQuery( "SELECT DISTINCT {$fields} " .
+                                     "FROM ezcontentclass cc{$filterTableSQL}, {$classNameFilter['from']} " .
                                      "WHERE $classIDCondition AND" .
-                                     "      cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL " .
-                                     "ORDER BY $classNameFilter[nameField] ASC" );
+                                     "      cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " {$filterSQL} " .
+                                     "ORDER BY {$classNameFilter['nameField']} ASC" );
             $classList = eZPersistentObject::handleRows( $rows, 'eZContentClass', $asObject );
         }
 
@@ -680,11 +680,11 @@ static function fetchAllClasses( $asObject = true, $includeFilter = true, $group
         $classList = array();
         $db = eZDB::instance();
         // If $asObject is true we fetch all fields in class
-        $fields = $asObject ? "cc.*" : "cc.id, $classNameFilter[nameField]";
-        $rows = $db->arrayQuery( "SELECT DISTINCT $fields " .
-                                 "FROM ezcontentclass cc$filterTableSQL, $classNameFilter[from] " .
-                                 "WHERE cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . "$filterSQL AND $classNameFilter[where]" .
-                                 "ORDER BY $classNameFilter[nameField] ASC" );
+        $fields = $asObject ? "cc.*" : "cc.id, {$classNameFilter['nameField']}";
+        $rows = $db->arrayQuery( "SELECT DISTINCT {$fields} " .
+                                 "FROM ezcontentclass cc{$filterTableSQL}, {$classNameFilter['from']} " .
+                                 "WHERE cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . "{$filterSQL} AND {$classNameFilter['where']}" .
+                                 "ORDER BY {$classNameFilter['nameField']} ASC" );
 
         $classList = eZPersistentObject::handleRows( $rows, 'eZContentClass', $asObject );
         return $classList;
diff --git a/kernel/classes/ezcontentclassclassgroup.php b/kernel/classes/ezcontentclassclassgroup.php
index 357d0695d42..ef4cdf67264 100644
--- a/kernel/classes/ezcontentclassclassgroup.php
+++ b/kernel/classes/ezcontentclassclassgroup.php
@@ -155,12 +155,12 @@ static function fetchClassList( $contentclass_version, $group_id, $asObject = tr
         }
 
         $db = eZDB::instance();
-        $sql = "SELECT contentclass.* $classNameSqlFilter[nameField]
-                FROM ezcontentclass  contentclass, ezcontentclass_classgroup class_group $classNameSqlFilter[from]
+        $sql = "SELECT contentclass.* {$classNameSqlFilter['nameField']}
+                FROM ezcontentclass  contentclass, ezcontentclass_classgroup class_group {$classNameSqlFilter['from']}
                 WHERE contentclass.id=class_group.contentclass_id
-                $versionCond
-                AND class_group.group_id='$group_id' $classNameSqlFilter[where]
-                $orderByClause";
+                {$versionCond}
+                AND class_group.group_id='$group_id' {$classNameSqlFilter['where']}
+                {$orderByClause}";
         $rows = $db->arrayQuery( $sql );
         return eZPersistentObject::handleRows( $rows, "eZContentClass", $asObject );
     }
diff --git a/kernel/classes/ezcontentobject.php b/kernel/classes/ezcontentobject.php
index 141f358c9c7..f4d1b2b7904 100644
--- a/kernel/classes/ezcontentobject.php
+++ b/kernel/classes/ezcontentobject.php
@@ -3281,26 +3281,26 @@ function relatedObjects( $fromObjectVersion = false,
                         ezcontentclass.identifier as contentclass_identifier,
                         ezcontentclass.is_container as is_container,
                         ezcontentobject.*, ezcontentobject_name.name as name, ezcontentobject_name.real_translation
-                        $sortingInfo[attributeTargetSQL]
+                        {$sortingInfo['attributeTargetSQL']}
                      FROM
                         ezcontentclass,
                         ezcontentobject,
                         ezcontentobject_link,
                         ezcontentobject_name
-                        $sortingInfo[attributeFromSQL]
+                        {$sortingInfo['attributeFromSQL']}
                      WHERE
                         ezcontentclass.id=ezcontentobject.contentclass_id AND
                         ezcontentclass.version=0 AND
                         ezcontentobject.status=" . eZContentObject::STATUS_PUBLISHED . " AND
-                        $sortingInfo[attributeWhereSQL]
-                        $relatedClassIdentifiersSQL
-                        $relationTypeMasking
-                        $fromOrToContentObjectID
-                        $showInvisibleNodesCond AND
+                        {$sortingInfo['attributeWhereSQL']}
+                        {$relatedClassIdentifiersSQL}
+                        {$relationTypeMasking}
+                        {$fromOrToContentObjectID}
+                        {$showInvisibleNodesCond} AND
                         ezcontentobject.id = ezcontentobject_name.contentobject_id AND
                         ezcontentobject.current_version = ezcontentobject_name.content_version AND
                         " . eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' ) . "
-                        $sortingString";
+                        {$sortingString}";
         if ( !$offset && !$limit )
         {
             $relatedObjects = $db->arrayQuery( $query );
@@ -4926,11 +4926,11 @@ function canCreateClassList( $asObject = false, $includeFilter = true, $groupLis
         if ( $fetchAll )
         {
             // If $asObject is true we fetch all fields in class
-            $fields = $asObject ? "cc.*, $classNameFilter[nameField]" : "cc.id, $classNameFilter[nameField]";
-            $rows = $db->arrayQuery( "SELECT DISTINCT $fields " .
-                                     "FROM ezcontentclass cc$filterTableSQL, $classNameFilter[from] " .
-                                     "WHERE cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL AND $classNameFilter[where] " .
-                                     "ORDER BY $classNameFilter[nameField] ASC" );
+            $fields = $asObject ? "cc.*, {$classNameFilter['nameField']}" : "cc.id, {$classNameFilter['nameField']}";
+            $rows = $db->arrayQuery( "SELECT DISTINCT {$fields} " .
+                                     "FROM ezcontentclass cc{$filterTableSQL}, {$classNameFilter['from']} " .
+                                     "WHERE cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " {$filterSQL} AND {$classNameFilter['where']} " .
+                                     "ORDER BY {$classNameFilter['nameField']} ASC" );
             $classList = eZPersistentObject::handleRows( $rows, 'eZContentClass', $asObject );
         }
         else
@@ -4943,12 +4943,12 @@ function canCreateClassList( $asObject = false, $includeFilter = true, $groupLis
 
             $classIDCondition = $db->generateSQLINStatement( $classIDArray, 'cc.id' );
             // If $asObject is true we fetch all fields in class
-            $fields = $asObject ? "cc.*, $classNameFilter[nameField]" : "cc.id, $classNameFilter[nameField]";
-            $rows = $db->arrayQuery( "SELECT DISTINCT $fields " .
-                                     "FROM ezcontentclass cc$filterTableSQL, $classNameFilter[from] " .
-                                     "WHERE $classIDCondition AND" .
-                                     "      cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL AND $classNameFilter[where] " .
-                                     "ORDER BY $classNameFilter[nameField] ASC" );
+            $fields = $asObject ? "cc.*, {$classNameFilter['nameField']}" : "cc.id, {$classNameFilter['nameField']}";
+            $rows = $db->arrayQuery( "SELECT DISTINCT {$fields} " .
+                                     "FROM ezcontentclass cc{$filterTableSQL}, {$classNameFilter['from']} " .
+                                     "WHERE {$classIDCondition} AND" .
+                                     "      cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " {$filterSQL} AND {$classNameFilter['where']} " .
+                                     "ORDER BY {$classNameFilter['nameField']} ASC" );
             $classList = eZPersistentObject::handleRows( $rows, 'eZContentClass', $asObject );
         }
 
diff --git a/kernel/classes/ezcontentobjecttrashnode.php b/kernel/classes/ezcontentobjecttrashnode.php
index a09487c5462..29e785f82a4 100644
--- a/kernel/classes/ezcontentobjecttrashnode.php
+++ b/kernel/classes/ezcontentobjecttrashnode.php
@@ -257,7 +257,7 @@ static function trashList( $params = false, $asCount = false )
                         ezcontentclass.identifier as class_identifier,
                         ezcontentobject_name.name as name,
                         ezcontentobject_name.real_translation
-                        $sortingInfo[attributeTargetSQL] ";
+                        {$sortingInfo['attributeTargetSQL']} ";
         }
         $query .= "FROM
                         ezcontentobject_trash ezcot
diff --git a/kernel/classes/ezcontentobjecttreenode.php b/kernel/classes/ezcontentobjecttreenode.php
index 9477b89bd05..da398643da5 100644
--- a/kernel/classes/ezcontentobjecttreenode.php
+++ b/kernel/classes/ezcontentobjecttreenode.php
@@ -623,8 +623,8 @@ static function createSortingSQLStrings( $sortList, $treeTableName = 'ezcontento
                         {
                             $classNameFilter = eZContentClassName::sqlFilter();
                             $sortingFields .= 'contentclass_name';
-                            $datatypeSortingTargetSQL .= ", $classNameFilter[nameField] AS contentclass_name";
-                            $attributeFromSQL .= " INNER JOIN $classNameFilter[from] ON ($classNameFilter[where])";
+                            $datatypeSortingTargetSQL .= ", {$classNameFilter['nameField']} AS contentclass_name";
+                            $attributeFromSQL .= " INNER JOIN {$classNameFilter['from']} ON ({$classNameFilter['where']})";
                         } break;
                         case 'priority':
                         {
@@ -667,7 +667,7 @@ static function createSortingSQLStrings( $sortList, $treeTableName = 'ezcontento
 
                                 $sql = $dataType->customSortingSQL( $params );
 
-                                $datatypeFromSQL .= " INNER JOIN $sql[from] ON ($sql[where])";
+                                $datatypeFromSQL .= " INNER JOIN {$sql['from']} ON ({$sql['where']})";
                                 $datatypeSortingFieldSQL = $sql['sorting_field'];
                                 $datatypeSortingTargetSQL .= ', ' . $sql['sorting_field'];
                             }
@@ -1102,7 +1102,7 @@ static function createAttributeFilterSQLStrings( &$attributeFilter, &$sortingInf
                             $classNameFilter = eZContentClassName::sqlFilter();
                             $filterField = $classNameFilter['nameField'];
                             $filterFieldType = 'string';
-                            $filterSQL['from'] .= " INNER JOIN $classNameFilter[from] ON ($classNameFilter[where])";
+                            $filterSQL['from'] .= " INNER JOIN {$classNameFilter['from']} ON ({$classNameFilter['where']})";
                         } break;
                         case 'priority':
                         {
@@ -2042,24 +2042,24 @@ static function subTreeByNodeID( $params = false, $nodeID = 0 )
             "    ezcontentobject_tree.contentobject_id = ezcontentobject_name.contentobject_id AND " .
             "    ezcontentobject_tree.contentobject_version = ezcontentobject_name.content_version " .
             ") " .
-            "$sortingInfo[attributeFromSQL] $attributeFilter[from] $extendedAttributeFilter[tables] $sqlPermissionChecking[from] " .
+            "{$sortingInfo['attributeFromSQL']} {$attributeFilter['from']} {$extendedAttributeFilter['tables']} {$sqlPermissionChecking['from']} " .
             "WHERE " .
             "$pathStringCond " .
-            "$extendedAttributeFilter[joins] " .
-            "$sortingInfo[attributeWhereSQL] " .
-            "$attributeFilter[where] " .
+            "{$extendedAttributeFilter['joins']} " .
+            "{$sortingInfo['attributeWhereSQL']} " .
+            "{$attributeFilter['where']} " .
             "$notEqParentString " .
             "$mainNodeOnlyCond " .
             "$classCondition " .
             "$objectNameLanguageFilter " .
             "$showInvisibleNodesCond " .
-            "$sqlPermissionChecking[where] " .
+            "{$sqlPermissionChecking['where']} " .
             "$objectNameFilterSQL AND " .
             "$languageFilter " .
             $groupBySQL;
 
         if ( $sortingInfo['sortingFields'] )
-            $query .= " ORDER BY $sortingInfo[sortingFields]";
+            $query .= " ORDER BY {$sortingInfo['sortingFields']}";
 
         $db = eZDB::instance();
 
@@ -2235,16 +2235,16 @@ static function subTreeMultiPaths( $nodesParams, $listParams = NULL )
 
             $queryNodes .= " (
                           $pathStringCond
-                          $extendedAttributeFilter[joins]
-                          $sortingInfo[attributeWhereSQL]
-                          $attributeFilter[where]
+                          {$extendedAttributeFilter['joins']}
+                          {$sortingInfo['attributeWhereSQL']}
+                          {$attributeFilter['where']}
                           ezcontentclass.version=0 AND
                           $notEqParentString
                           $mainNodeOnlyCond
                           $classCondition
                           " . eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' ) . "
                           $showInvisibleNodesCond
-                          $sqlPermissionChecking[where]
+                          {$sqlPermissionChecking['where']}
                           $languageFilter
                       )
                       OR";
@@ -2269,7 +2269,7 @@ static function subTreeMultiPaths( $nodesParams, $listParams = NULL )
             "ezcontentobject_tree.node_id, ezcontentobject_tree.parent_node_id, ezcontentobject_tree.path_identification_string, ezcontentobject_tree.path_string, " .
             "ezcontentobject_tree.priority, ezcontentobject_tree.remote_id, ezcontentobject_tree.sort_field, ezcontentobject_tree.sort_order, ezcontentclass.serialized_name_list as class_serialized_name_list, " .
             "ezcontentclass.identifier as class_identifier, ezcontentclass.is_container $groupBySelectText, ezcontentobject_name.name, ezcontentobject_name.real_translation " .
-            "$sortingInfo[attributeTargetSQL], $nodeParams[ResultID] AS resultid " .
+            "{$sortingInfo['attributeTargetSQL']}, {$nodeParams['ResultID']} AS resultid " .
             "FROM ezcontentobject_tree " .
             "INNER JOIN ezcontentobject ON (ezcontentobject.id = ezcontentobject_tree.contentobject_id) " .
             "INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id) " .
@@ -2277,17 +2277,17 @@ static function subTreeMultiPaths( $nodesParams, $listParams = NULL )
             "    ezcontentobject_name.contentobject_id = ezcontentobject_tree.contentobject_id AND " .
             "    ezcontentobject_name.content_version = ezcontentobject_tree.contentobject_version " .
             ") " .
-            "$sortingInfo[attributeFromSQL] " .
-            "$attributeFilter[from] " .
-            "$extendedAttributeFilter[tables] " .
-            "$sqlPermissionChecking[from] " .
+            "{$sortingInfo['attributeFromSQL']} " .
+            "{$attributeFilter['from']} " .
+            "{$extendedAttributeFilter['tables']} " .
+            "{$sqlPermissionChecking['from']} " .
             "WHERE " .
             substr( $queryNodes, 0, -2 ) . " " .
             $groupBySQL;
 
         if ( $sortingInfo['sortingFields'] )
         {
-            $query .= " ORDER BY $sortingInfo[sortingFields]";
+            $query .= " ORDER BY {$sortingInfo['sortingFields']}";
         }
 
         $db = eZDB::instance();
@@ -2485,19 +2485,19 @@ static function subTreeCountByNodeID( $params = array(), $nodeID )
                            ezcontentobject_name.contentobject_id = ezcontentobject_tree.contentobject_id AND
                            ezcontentobject_name.content_version = ezcontentobject_tree.contentobject_version
                        )
-                       $attributeFilter[from]
-                       $extendedAttributeFilter[tables]
-                       $sqlPermissionChecking[from]
+                       {$attributeFilter['from']}
+                       {$extendedAttributeFilter['tables']}
+                       {$sqlPermissionChecking['from']}
                   WHERE $pathStringCond
-                        $extendedAttributeFilter[joins]
+                        {$extendedAttributeFilter['joins']}
                         $mainNodeOnlyCond
                         $classCondition
-                        $attributeFilter[where]
+                        {$attributeFilter['where']}
                         ezcontentclass.version=0 AND
                         $notEqParentString
                         $objectNameLanguageFilter
                         $showInvisibleNodesCond
-                        $sqlPermissionChecking[where]
+                        {$sqlPermissionChecking['where']}
                         $objectNameFilterSQL
                         $languageFilter ";
 
@@ -2592,20 +2592,20 @@ static function calendar( $params = false, $nodeID = 0 )
                           ezcontentobject_name.content_version = ezcontentobject_tree.contentobject_version
                       )
 
-                      $attributeFilter[from]
-                      $extendedAttributeFilter[tables]
-                      $sqlPermissionChecking[from]
+                      {$attributeFilter['from']}
+                      {$extendedAttributeFilter['tables']}
+                      {$sqlPermissionChecking['from']}
                    WHERE
                       $pathStringCond
-                      $extendedAttributeFilter[joins]
-                      $attributeFilter[where]
+                      {$extendedAttributeFilter['joins']}
+                      {$attributeFilter['where']}
                       ezcontentclass.version = 0 AND
                       $notEqParentString
                       $mainNodeOnlyCond
                       $classCondition
                       " . eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' ) . "
                       $showInvisibleNodesCond
-                      $sqlPermissionChecking[where]
+                      {$sqlPermissionChecking['where']}
                 $groupBySQL";
 
 
@@ -5162,11 +5162,11 @@ function canCreateClassList( $asObject = false, $includeFilter = true, $groupLis
         if ( $fetchAll )
         {
             // If $asObject is true we fetch all fields in class
-            $fields = $asObject ? "cc.*, $classNameFilter[nameField]" : "cc.id, $classNameFilter[nameField]";
+            $fields = $asObject ? "cc.*, {$classNameFilter['nameField']}" : "cc.id, {$classNameFilter['nameField']}";
             $rows = $db->arrayQuery( "SELECT DISTINCT $fields " .
-                                     "FROM ezcontentclass cc$filterTableSQL, $classNameFilter[from] " .
-                                     "WHERE cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL AND $classNameFilter[where] " .
-                                     "ORDER BY $classNameFilter[nameField] ASC" );
+                                     "FROM ezcontentclass cc$filterTableSQL, {$classNameFilter['from']} " .
+                                     "WHERE cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL AND {$classNameFilter['where']} " .
+                                     "ORDER BY {$classNameFilter['nameField']} ASC" );
             $classList = eZPersistentObject::handleRows( $rows, 'eZContentClass', $asObject );
         }
         else
@@ -5179,12 +5179,12 @@ function canCreateClassList( $asObject = false, $includeFilter = true, $groupLis
 
             $classIDCondition = $db->generateSQLINStatement( $classIDArray, 'cc.id' );
             // If $asObject is true we fetch all fields in class
-            $fields = $asObject ? "cc.*, $classNameFilter[nameField]" : "cc.id, $classNameFilter[nameField]";
+            $fields = $asObject ? "cc.*, {$classNameFilter['nameField']}" : "cc.id, {$classNameFilter['nameField']}";
             $rows = $db->arrayQuery( "SELECT DISTINCT $fields " .
-                                     "FROM ezcontentclass cc$filterTableSQL, $classNameFilter[from] " .
+                                     "FROM ezcontentclass cc$filterTableSQL, {$classNameFilter['from']} " .
                                      "WHERE $classIDCondition AND" .
-                                     "      cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL AND $classNameFilter[where] " .
-                                     "ORDER BY $classNameFilter[nameField] ASC" );
+                                     "      cc.version = " . eZContentClass::VERSION_STATUS_DEFINED . " $filterSQL AND {$classNameFilter['where']} " .
+                                     "ORDER BY {$classNameFilter['nameField']} ASC" );
             $classList = eZPersistentObject::handleRows( $rows, 'eZContentClass', $asObject );
         }
 
diff --git a/kernel/common/ezcontentstructuretreeoperator.php b/kernel/common/ezcontentstructuretreeoperator.php
index f253c66ca82..360d63c1a62 100644
--- a/kernel/common/ezcontentstructuretreeoperator.php
+++ b/kernel/common/ezcontentstructuretreeoperator.php
@@ -149,13 +149,13 @@ function subTree( $params, $nodeID, $countChildren = false )
                                    ezcontentobject_name.contentobject_id = ezcontentobject_tree.contentobject_id AND
                                    ezcontentobject_name.content_version = ezcontentobject_tree.contentobject_version
                                )
-                               $permissionChecking[from]
+                               {$permissionChecking['from']}
                           WHERE $pathStringCond
                                 $classCondition
                                 ezcontentclass.version=0 AND
                                 $notEqParentString
                                 " . eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' ) . "
-                                $permissionChecking[where] ";
+                                {$permissionChecking['where']} ";
         }
         else
         {
@@ -174,19 +174,19 @@ function subTree( $params, $nodeID, $countChildren = false )
                                  ezcontentobject_name.contentobject_id = ezcontentobject_tree.contentobject_id AND
                                  ezcontentobject_name.content_version = ezcontentobject_tree.contentobject_version
                              )
-                             $sortingInfo[attributeFromSQL]
-                             $permissionChecking[from]
+                             {$sortingInfo['attributeFromSQL']}
+                             {$permissionChecking['from']}
                       WHERE
                              $pathStringCond
-                             $sortingInfo[attributeWhereSQL]
+                             {$sortingInfo['attributeWhereSQL']}
                              ezcontentclass.version=0 AND
                              $notEqParentString
                              $classCondition
                              ezcontentobject_tree.contentobject_is_published = 1 AND
                              " . eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' ) . "
                              $showInvisibleNodesCond
-                             $permissionChecking[where]
-                      ORDER BY $sortingInfo[sortingFields]";
+                             {$permissionChecking['where']}
+                      ORDER BY {$sortingInfo['sortingFields']}";
 
         }
 
diff --git a/kernel/content/ezcontentfunctioncollection.php b/kernel/content/ezcontentfunctioncollection.php
index 70a2e3c9ee6..27fa643230e 100644
--- a/kernel/content/ezcontentfunctioncollection.php
+++ b/kernel/content/ezcontentfunctioncollection.php
@@ -1019,13 +1019,13 @@ static public function fetchKeyword( $alphabet,
                        INNER JOIN ezcontentobject ON (ezcontentobject_attribute.version = ezcontentobject.current_version AND ezcontentobject_attribute.contentobject_id = ezcontentobject.id)
                        INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
                        INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
-                       $sortingInfo[attributeFromSQL]
-                       $sqlPermissionChecking[from]
+                       {$sortingInfo['attributeFromSQL']}
+                       {$sqlPermissionChecking['from']}
                   WHERE
                   $parentNodeIDString
                   $sqlMatching
                   $showInvisibleNodesCond
-                  $sqlPermissionChecking[where]
+                  {$sqlPermissionChecking['where']}
                   $sqlClassIDString
                   $sqlOwnerString
                   AND ezcontentclass.version = 0
diff --git a/kernel/private/modules/oauth/authorize.php b/kernel/private/modules/oauth/authorize.php
index dd4db049342..4722ac937c9 100644
--- a/kernel/private/modules/oauth/authorize.php
+++ b/kernel/private/modules/oauth/authorize.php
@@ -2,11 +2,11 @@
 /**
  * File containing the oauth/authorize view definition
  *
- * @param string $_GET[client_id] the client application identifier, as in ezpRestClient
- * @param string $_GET[redirect_uri] the URI the view should redirect to in case of success
- * @param string $_GET[response_type] the requested response type. Can be code_and_token, code, or token
- * @param string $_GET[scope] the permissions scope the client requests (optional)
- * @param string $_GET[state] Not implemented yet (optional)
+ * @param string $_GET['client_id'] the client application identifier, as in ezpRestClient
+ * @param string $_GET['redirect_uri'] the URI the view should redirect to in case of success
+ * @param string $_GET['response_type'] the requested response type. Can be code_and_token, code, or token
+ * @param string $_GET['scope'] the permissions scope the client requests (optional)
+ * @param string $_GET['state'] Not implemented yet (optional)
  *
  * @copyright Copyright (C) eZ Systems AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
diff --git a/kernel/search/plugins/ezsearchengine/ezsearchengine.php b/kernel/search/plugins/ezsearchengine/ezsearchengine.php
index 21d310aea81..f103287a953 100644
--- a/kernel/search/plugins/ezsearchengine/ezsearchengine.php
+++ b/kernel/search/plugins/ezsearchengine/ezsearchengine.php
@@ -851,7 +851,7 @@ public function search( $searchText, $params = array(), $searchTypes = array() )
                                               $subTreeTable
                                               INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
                                               INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
-                                              $sqlPermissionChecking[from]
+                                              {$sqlPermissionChecking['from']}
                                          WHERE
                                                $searchDateQuery
                                                $sectionQuery
@@ -862,7 +862,7 @@ public function search( $searchText, $params = array(), $searchTypes = array() )
                                          ezcontentclass.version = '0' AND
                                          ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id
                                          $showInvisibleNodesCond
-                                         $sqlPermissionChecking[where]",
+                                         {$sqlPermissionChecking['where']}",
                                     eZDBInterface::SERVER_SLAVE );
                     }
                     else
@@ -880,7 +880,7 @@ public function search( $searchText, $params = array(), $searchTypes = array() )
                                              INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
                                              INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
                                              INNER JOIN $tmpTable0 ON ($tmpTable0.contentobject_id = ezsearch_object_word_link.contentobject_id)
-                                             $sqlPermissionChecking[from]
+                                             {$sqlPermissionChecking['from']}
                                           WHERE
                                           $searchDateQuery
                                           $sectionQuery
@@ -891,7 +891,7 @@ public function search( $searchText, $params = array(), $searchTypes = array() )
                                           ezcontentclass.version = '0' AND
                                           ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id
                                           $showInvisibleNodesCond
-                                          $sqlPermissionChecking[where]",
+                                          {$sqlPermissionChecking['where']}",
                                     eZDBInterface::SERVER_SLAVE );
                     }
                     $i++;
@@ -913,7 +913,7 @@ public function search( $searchText, $params = array(), $searchTypes = array() )
                                           $subTreeTable
                                           INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
                                           INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
-                                          $sqlPermissionChecking[from]
+                                          {$sqlPermissionChecking['from']}
                                      WHERE
                                           $searchDateQuery
                                           $sectionQuery
@@ -923,7 +923,7 @@ public function search( $searchText, $params = array(), $searchTypes = array() )
                                           ezcontentclass.version = '0' AND
                                           ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id
                                           $showInvisibleNodesCond
-                                          $sqlPermissionChecking[where]",
+                                          {$sqlPermissionChecking['where']}",
                              eZDBInterface::SERVER_SLAVE );
                  $this->TempTablesCount = 1;
                  $i = $this->TempTablesCount;
@@ -1135,7 +1135,7 @@ function buildSortSQL( $sortArray )
                             $classNameFilter = eZContentClassName::sqlFilter();
                             $selectSQL .= ", " . $classNameFilter['nameField'] . " AS class_name";
                             $sortingFields .= "class_name";
-                            $attributeFromSQL .= " INNER JOIN $classNameFilter[from] ON ($classNameFilter[where])";
+                            $attributeFromSQL .= " INNER JOIN {$classNameFilter['from']} ON ({$classNameFilter['where']})";
                         } break;
                         case 'priority':
                         {
@@ -1394,7 +1394,7 @@ function createTemporaryTable( $searchPartText  )
                        $subTreeTable
                        INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
                        INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
-                       $sqlPermissionChecking[from]
+                       {$sqlPermissionChecking['from']}
                     WHERE
                     $searchDateQuery
                     $sectionQuery
@@ -1404,7 +1404,7 @@ function createTemporaryTable( $searchPartText  )
                     $subTreeSQL
                     ezcontentclass.version = '0' AND
                     ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id
-                    $sqlPermissionChecking[where]",
+                    {$sqlPermissionChecking['where']}",
                     eZDBInterface::SERVER_SLAVE );
         }
         else
@@ -1421,7 +1421,7 @@ function createTemporaryTable( $searchPartText  )
                        INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
                        INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
                        INNER JOIN $tmpTable0 ON ($tmpTable0.contentobject_id = ezsearch_object_word_link.contentobject_id)
-                       $sqlPermissionChecking[from]
+                       {$sqlPermissionChecking['from']}
                     WHERE
                     $searchDateQuery
                     $sectionQuery
@@ -1431,7 +1431,7 @@ function createTemporaryTable( $searchPartText  )
                     $subTreeSQL
                     ezcontentclass.version = '0' AND
                     ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id
-                    $sqlPermissionChecking[where]",
+                    {$sqlPermissionChecking['where']}",
                     eZDBInterface::SERVER_SLAVE );
         }
 
@@ -1533,7 +1533,7 @@ function buildTempTablesForFullTextSearch( $searchPartsArray, $generalFilterList
                        $subTreeTable
                        INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
                        INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
-                       $sqlPermissionChecking[from]
+                       {$sqlPermissionChecking['from']}
                     WHERE
                     $searchDateQuery
                     $sectionQuery
@@ -1543,7 +1543,7 @@ function buildTempTablesForFullTextSearch( $searchPartsArray, $generalFilterList
                     $subTreeSQL
                     ezcontentclass.version = '0' AND
                     ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id
-                    $sqlPermissionChecking[where]",
+                    {$sqlPermissionChecking['where']}",
                     eZDBInterface::SERVER_SLAVE );
                 }
                 else
@@ -1560,7 +1560,7 @@ function buildTempTablesForFullTextSearch( $searchPartsArray, $generalFilterList
                        INNER JOIN ezcontentclass ON (ezcontentclass.id = ezcontentobject.contentclass_id)
                        INNER JOIN ezcontentobject_tree ON (ezcontentobject_tree.contentobject_id = ezcontentobject.id)
                        INNER JOIN $tmpTable0 ON ($tmpTable0.contentobject_id = ezsearch_object_word_link.contentobject_id)
-                       $sqlPermissionChecking[from]
+                       {$sqlPermissionChecking['from']}
                     WHERE
                     $searchDateQuery
                     $sectionQuery
@@ -1570,7 +1570,7 @@ function buildTempTablesForFullTextSearch( $searchPartsArray, $generalFilterList
                     $subTreeSQL
                     ezcontentclass.version = '0' AND
                     ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id
-                    $sqlPermissionChecking[where]",
+                    {$sqlPermissionChecking['where']}",
                     eZDBInterface::SERVER_SLAVE );
                 }
                 $i++;