Index: t3lib/class.t3lib_frontendedit.php
===================================================================
--- t3lib/class.t3lib_frontendedit.php (revision 8878)
+++ t3lib/class.t3lib_frontendedit.php (working copy)
@@ -154,7 +154,7 @@
if ($editClass) {
$edit = t3lib_div::getUserObj($editClass);
if (is_object($edit)) {
- $content = $edit->editIcons($content, $params, $conf, $currentRecord, $dataArray, $addURLParamStr, $table, $editUid, $fieldList);
+ $content = $edit->editIcons($content, $params, $conf, $currentRecord, $dataArray, $addUrlParamStr, $table, $editUid, $fieldList);
}
}
}
Index: t3lib/class.t3lib_tceforms_inline.php
===================================================================
--- t3lib/class.t3lib_tceforms_inline.php (revision 8878)
+++ t3lib/class.t3lib_tceforms_inline.php (working copy)
@@ -600,7 +600,7 @@
$enabledControls = $config['appearance']['enabledControls'];
// Hook: Can disable/enable single controls for specific child records:
foreach ($this->hookObjects as $hookObj) {
- $hookObj->renderForeignRecordHeaderControl_preProcess($parentUid, $foreign_table, $rec, $config, $isVirtual, $enabledControls);
+ $hookObj->renderForeignRecordHeaderControl_preProcess($parentUid, $foreign_table, $rec, $config, $isVirtualRecord, $enabledControls);
}
// Icon to visualize that a required field is nested in this inline level:
@@ -715,7 +715,7 @@
// Hook: Post-processing of single controls for specific child records:
foreach ($this->hookObjects as $hookObj) {
- $hookObj->renderForeignRecordHeaderControl_postProcess($parentUid, $foreign_table, $rec, $config, $isVirtual, $cells);
+ $hookObj->renderForeignRecordHeaderControl_postProcess($parentUid, $foreign_table, $rec, $config, $isVirtualRecord, $cells);
}
// Compile items into a DIV-element:
return '
@@ -826,7 +826,7 @@
$PA['fieldTSConfig'] = $this->fObj->setTSconfig($foreign_table,array(),$foreign_selector);
$config = $PA['fieldConf']['config'];
- if(!$disabled) {
+ if (TRUE) {
// Create option tags:
$opt = array();
$styleAttrValue = '';
@@ -1170,8 +1170,8 @@
$parentRecord = $this->getRecord(0, $parent['table'], $parent['uid']);
$parentLanguageField = $GLOBALS['TCA'][$parent['table']]['ctrl']['languageField'];
$childLanguageField = $GLOBALS['TCA'][$current['table']]['ctrl']['languageField'];
- if ($parentRecord[$languageField]>0) {
- $record[$childLanguageField] = $parentRecord[$languageField];
+ if ($parentRecord[$parentLanguageField] > 0) {
+ $record[$childLanguageField] = $parentRecord[$parentLanguageField];
}
}
Index: t3lib/matchcondition/class.t3lib_matchcondition_frontend.php
===================================================================
--- t3lib/matchcondition/class.t3lib_matchcondition_frontend.php (revision 8878)
+++ t3lib/matchcondition/class.t3lib_matchcondition_frontend.php (working copy)
@@ -169,7 +169,7 @@
if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_matchcondition.php']['devices_class'])) {
foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_matchcondition.php']['devices_class'] as $_classRef) {
$_procObj = t3lib_div::getUserObj($_classRef);
- return $_procObj->whichDevice_ext($useragent);
+ return $_procObj->whichDevice_ext($userAgent);
}
}
Index: t3lib/class.t3lib_pagerenderer.php
===================================================================
--- t3lib/class.t3lib_pagerenderer.php (revision 8878)
+++ t3lib/class.t3lib_pagerenderer.php (working copy)
@@ -990,7 +990,7 @@
if (!isset($this->cssInline[$name]) && !empty($block)) {
$this->cssInline[$name] = array (
'code' => $block,
- 'compress' => $compress,
+ 'compress' => $compressed,
'forceOnTop' => $forceOnTop
);
}
Index: t3lib/class.t3lib_sqlengine.php
===================================================================
--- t3lib/class.t3lib_sqlengine.php (revision 8878)
+++ t3lib/class.t3lib_sqlengine.php (working copy)
@@ -223,8 +223,9 @@
$fN = $fInfo['Field'];
// Set value:
-// FIXME $options not defined
- $saveArray[$fN] = isset($fields_values[$fN]) ? $fields_values[$fN] : $options['Default'];
+ if (isset($fields_values[$fN])) {
+ $saveArray[$fN] = $fields_values[$fN];
+ }
// Process value:
$this->processAccordingToConfig($saveArray[$fN], $fInfo);
@@ -589,8 +590,8 @@
* @return array Array of keys pointing to result rows in $this->data[$table]
*/
function selectFromData($table,$where) {
-
$output = array();
+ $itemKeys = array();
if (is_array($this->data[$table])) {
// All keys:
Index: t3lib/class.t3lib_stdgraphic.php
===================================================================
--- t3lib/class.t3lib_stdgraphic.php (revision 8878)
+++ t3lib/class.t3lib_stdgraphic.php (working copy)
@@ -908,7 +908,6 @@
$bits = explode(' ',$text);
foreach ($bits as $word) {
$word.=' ';
- $word = $word;
$wordInf = $this->ImageTTFBBoxWrapper($fontSize, $angle, $fontFile, $word, $splitRenderingConf ,$sF);
$wordW = ($wordInf[2]-$wordInf[0]);
$this->ImageTTFTextWrapper($im, $fontSize, $angle, $x, $y, $Fcolor, $fontFile, $word, $splitRenderingConf, $sF);
Index: t3lib/class.t3lib_fullsearch.php
===================================================================
--- t3lib/class.t3lib_fullsearch.php (revision 8878)
+++ t3lib/class.t3lib_fullsearch.php (working copy)
@@ -507,13 +507,12 @@
while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
if ($first) {
$xmlObj->setRecFields($table,implode(',',array_keys($row)));
- // debug($xmlObj->XML_recFields);
$first=0;
}
$valueArray = $row;
if ($GLOBALS['SOBE']->MOD_SETTINGS['search_result_labels']) {
foreach ($valueArray as $key => $val) {
- $valueArray[$key] = $this->getProcessedValueExtra($table, $key, $val, $conf, ',');
+ $valueArray[$key] = $this->getProcessedValueExtra($table, $key, $val, array(), ',');
}
}
$xmlObj->addRecord($table, $valueArray);
@@ -859,6 +858,7 @@
}
$d->close();
natcasesort($fileArray);
+ $out = '';
while (list(, $fileName) = each($fileArray)) {
if (t3lib_div::inList($fV, $fileName) || $fV == $fileName) {
if (!$out) {
@@ -938,7 +938,7 @@
}
}
}
- $GLOBALS['TYPO3_DB']->sql_free_result($res);
+ $GLOBALS['TYPO3_DB']->sql_free_result($checkres);
}
}
} else {
@@ -987,6 +987,7 @@
if (!$GLOBALS['BE_USER']->isAdmin() && $GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts']) {
$webMounts = $GLOBALS['BE_USER']->returnWebmounts();
$perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
+ $webMountPageTree = '';
foreach($webMounts as $key => $val) {
if ($webMountPageTree) {
$webMountPageTreePrefix = ',';
@@ -1099,6 +1100,7 @@
* @return [type] ...
*/
function csvRowTitles($row, $conf, $table) {
+ $out = '';
$SET = $GLOBALS['SOBE']->MOD_SETTINGS;
foreach ($row as $fN => $fV) {
if (t3lib_div::inList($SET['queryFields'], $fN) || (!$SET['queryFields'] && $fN!='pid')) {
Index: t3lib/class.t3lib_querygenerator.php
===================================================================
--- t3lib/class.t3lib_querygenerator.php (revision 8878)
+++ t3lib/class.t3lib_querygenerator.php (working copy)
@@ -587,6 +587,7 @@
$c=0;
$arrCount=0;
+ $loopcount = 0;
foreach ($queryConfig as $key => $conf) {
$subscript = $parent.'['.$key.']';
$lineHTML = '';
@@ -724,9 +725,8 @@
}
$loopcount = 1;
}
-// $codeArr[$arrCount] .='';
$this->queryConfig = $queryConfig;
-//modifyHTMLColor($color,$R,$G,$B)
+
return $codeArr;
}
@@ -846,6 +846,7 @@
$from_table_Arr[0] = $fieldSetup['foreign_table'];
}
$counter = 0;
+ $webMountPageTree = '';
while (list(, $from_table) = each($from_table_Arr)) {
if (($useTablePrefix && !$dontPrefixFirstTable && $counter!=1) || $counter==1) {
$tablePrefix = $from_table.'_';
@@ -1008,7 +1009,7 @@
$out='