*** empty log message ***
authorMichael Stucki <michael.stucki@typo3.org>
Mon, 12 Dec 2005 22:53:59 +0000 (22:53 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Mon, 12 Dec 2005 22:53:59 +0000 (22:53 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@908 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_extmgm.php
typo3/sysext/lang/lang.php

index aaf40eb..ff0da39 100644 (file)
@@ -257,27 +257,23 @@ class t3lib_extMgm {
                if (trim($str) && is_array($TCA[$table]) && is_array($TCA[$table]['types']))    {
                        foreach($TCA[$table]['types'] as $k => $v)      {
                                if (!$specificTypesList || t3lib_div::inList($specificTypesList,$k))    {
-
-
-
-                                       if ($insert) {
+                                       if ($insert)    {
                                                $append=true;
                                                $showItem = t3lib_div::trimExplode(',',$TCA[$table]['types'][$k]['showitem'],1);
-                                               foreach($showItem as $key => $fieldInfo) {
+                                               foreach($showItem as $key => $fieldInfo)        {
 
                                                        $parts = explode(';',$fieldInfo);
                                                        $theField = trim($parts[0]);
                                                        $palette = trim($parts[0]).';;'.trim($parts[2]);
 
                                                                // insert before: find exact field name or palette with number
-                                                       if (in_array($theField, $positionArr) OR in_array($palette, $positionArr) OR
-                                                               in_array('before:'.$theField, $positionArr) OR in_array('before:'.$palette, $positionArr))      {
+                                                       if (in_array($theField, $positionArr) || in_array($palette, $positionArr) || in_array('before:'.$theField, $positionArr) || in_array('before:'.$palette, $positionArr)) {
                                                                $showItem[$key]=trim($str).', '.$fieldInfo;
                                                                $append=false;
                                                                break;
                                                        }
                                                                // insert after
-                                                       if (in_array('after:'.$theField, $positionArr) OR in_array('after:'.$palette, $positionArr))    {
+                                                       if (in_array('after:'.$theField, $positionArr) || in_array('after:'.$palette, $positionArr))    {
                                                                $showItem[$key]=$fieldInfo.', '.trim($str);
                                                                $append=false;
                                                                break;
index 69a6da2..034eb34 100755 (executable)
@@ -160,7 +160,7 @@ class language {
                        $this->origCharSet = $this->charSet;
                        $this->charSet = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'];
 
-                       if ($this->charSet!='utf-8' && !$this->csConvObj->initCharset($this->charSet))          {
+                       if ($this->charSet!='utf-8' && !$this->csConvObj->initCharset($this->charSet))  {
                                t3lib_BEfunc::typo3PrintError ('The forced character set "'.$this->charSet.'" was not found in t3lib/csconvtbl/','Forced charset not found');
                                exit;
                        }