Index: typo3/sysext/impexp/app/index.php
===================================================================
--- typo3/sysext/impexp/app/index.php (revision 9122)
+++ typo3/sysext/impexp/app/index.php (revision )
@@ -1515,7 +1515,7 @@
* @return array Preset record, if any (otherwise false)
*/
function getPreset($uid) {
- list($preset) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*','tx_impexp_presets','uid='.intval($uid));
+ $preset = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*','tx_impexp_presets','uid='.intval($uid));
return $preset;
}
Index: typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php
===================================================================
--- typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php (revision 8742)
+++ typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php (revision )
@@ -467,14 +467,14 @@
$lines[] = '
'.$cmdLinks.' | ';
// Query:
- $ftrows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $ftrow = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
'index_fulltext',
'phash = '.intval($row['phash'])
);
$lines[] = ''.
- htmlspecialchars(t3lib_div::fixed_lgd_cs($this->utf8_to_currentCharset($ftrows[0]['fulltextdata']),3000)).
- ' Size: '.strlen($ftrows[0]['fulltextdata']).''.
+ htmlspecialchars(t3lib_div::fixed_lgd_cs($this->utf8_to_currentCharset($ftrow['fulltextdata']),3000)).
+ ' Size: '.strlen($ftrow['fulltextdata']).''.
' | ';
// Query:
@@ -623,12 +623,11 @@
$content = '';
// Selects the result row:
- $ftrows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $phashRecord = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
'index_phash',
'phash = '.intval($phash)
);
- $phashRecord = $ftrows[0];
// If found, display:
if (is_array($phashRecord)) {
@@ -1175,7 +1174,7 @@
function reindexPhash($phash, $pageId) {
// Query:
- list($resultRow) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $resultRow = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'ISEC.*, IP.*',
'index_phash IP, index_section ISEC',
'IP.phash = ISEC.phash
Index: t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php
===================================================================
--- t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php (revision 9400)
+++ t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php (revision )
@@ -281,11 +281,11 @@
protected function getChildrenOf(t3lib_tree_Node $node, $level) {
$nodeData = NULL;
if ($node->getId() !== 0) {
- $nodeData = current($GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $nodeData = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
$this->tableName,
'uid=' . $node->getId()
- ));
+ );
}
if ($nodeData == NULL) {
$nodeData = array(
Index: t3lib/stddb/tbl_be.php
===================================================================
--- t3lib/stddb/tbl_be.php (revision 9393)
+++ t3lib/stddb/tbl_be.php (revision )
@@ -27,7 +27,7 @@
/**
* Contains the dynamic configuation of the fields in the core tables of TYPO3: be_users, be_groups, sys_filemounts and sys_workspace
*
- * $Id: tbl_be.php 9393 2010-11-16 11:47:53Z steffenk $
+ * $Id: tbl_be.php 9377 2010-11-13 23:08:39Z baschny $
* Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
*
* @author Kasper Skårhøj
@@ -702,6 +702,7 @@
);
+
/**
* System filemounts - Defines filepaths on the server which can be mounted for users so they can upload and manage files online by eg. the Filelist module
*/
Index: t3lib/class.t3lib_page.php
===================================================================
--- t3lib/class.t3lib_page.php (revision 9328)
+++ t3lib/class.t3lib_page.php (revision )
@@ -1397,7 +1397,7 @@
if (($table=='pages' || (int)$TCA[$table]['ctrl']['versioningWS']>=2) && $workspace!==0) {
// Select workspace version of record:
- $rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
$fields,
$table,
'pid!=-1 AND
@@ -1407,8 +1407,8 @@
$this->deleteClause($table)
);
- if (is_array($rows[0])) {
- return $rows[0];
+ if (is_array($row)) {
+ return $row;
}
}
}
@@ -1439,7 +1439,7 @@
}
// Select workspace version of record, only testing for deleted.
- list($newrow) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $newrow = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
$fields,
$table,
'pid=-1 AND
@@ -1450,7 +1450,7 @@
// If version found, check if it could have been selected with enableFields on as well:
if (is_array($newrow)) {
- if ($bypassEnableFieldsCheck || $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ if ($bypassEnableFieldsCheck || $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'uid',
$table,
'pid=-1 AND
@@ -1464,7 +1464,7 @@
}
} else {
// OK, so no workspace version was found. Then check if online version can be selected with full enable fields and if so, return 1:
- if ($bypassEnableFieldsCheck || $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ if ($bypassEnableFieldsCheck || $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'uid',
$table,
'uid='.intval($uid).$enFields
@@ -1494,11 +1494,8 @@
}
else {
if ($wsid > 0) {
- $ws = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_workspace', 'uid='.intval($wsid).' AND deleted=0'); // No $TCA yet!
- if (count($ws)) {
- $ws = $ws[0];
- }
- else {
+ $ws = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', 'sys_workspace', 'uid='.intval($wsid).' AND deleted=0'); // No $TCA yet!
+ if (!is_array($ws)) {
return false;
}
}
Index: typo3/sysext/cms/layout/class.tx_cms_layout.php
===================================================================
--- typo3/sysext/cms/layout/class.tx_cms_layout.php (revision 9396)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php (revision )
@@ -402,8 +402,7 @@
$rootline = t3lib_BEfunc::BEgetRootLine($id);
$backendLayoutUid = null;
for ($i = count($rootline); $i > 0; $i--) {
- $res = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,be_layout,be_layout_next_level','pages','uid='.intval($rootline[$i]['uid']));
- $page = $res[0];
+ $page = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('uid,be_layout,be_layout_next_level','pages','uid='.intval($rootline[$i]['uid']));
if (intval($page['be_layout_next_level']) > 0 && $page['uid'] != $id ) {
$backendLayoutUid = intval($page['be_layout_next_level']);
break;
Index: t3lib/class.t3lib_userauthgroup.php
===================================================================
--- t3lib/class.t3lib_userauthgroup.php (revision 9366)
+++ t3lib/class.t3lib_userauthgroup.php (revision )
@@ -1595,7 +1595,7 @@
$wsRec = array('uid' => $wsRec);
break;
default:
- list($wsRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $wsRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
$fields,
'sys_workspace',
'pid=0 AND uid='.intval($wsRec).
Index: typo3/alt_doc.php
===================================================================
--- typo3/alt_doc.php (revision 9397)
+++ typo3/alt_doc.php (revision )
@@ -1178,7 +1178,7 @@
list($table,$orig_uid,$language) = explode(':',$justLocalized);
if ($TCA[$table] && $TCA[$table]['ctrl']['languageField'] && $TCA[$table]['ctrl']['transOrigPointerField']) {
- list($localizedRecord) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $localizedRecord = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'uid',
$table,
$TCA[$table]['ctrl']['languageField'].'='.intval($language).' AND '.
Index: typo3/class.db_list.inc
===================================================================
--- typo3/class.db_list.inc (revision 9327)
+++ typo3/class.db_list.inc (revision )
@@ -816,7 +816,7 @@
list($table,$orig_uid,$language) = explode(':',$justLocalized);
if ($TCA[$table] && $TCA[$table]['ctrl']['languageField'] && $TCA[$table]['ctrl']['transOrigPointerField']) {
- list($localizedRecord) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $localizedRecord = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'uid',
$table,
$TCA[$table]['ctrl']['languageField'].'='.intval($language).' AND '.
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (revision 9397)
+++ t3lib/class.t3lib_befunc.php (revision )
@@ -3982,7 +3982,7 @@
if ($workspace !== 0 && $TCA[$table] && $TCA[$table]['ctrl']['versioningWS']) {
// Select workspace version of record:
- $rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
$fields,
$table,
'pid=-1 AND
@@ -3991,7 +3991,7 @@
self::deleteClause($table)
);
- if (is_array($rows[0])) return $rows[0];
+ if (is_array($row)) return $row;
}
}
return FALSE;
@@ -4169,7 +4169,7 @@
if ($workspace!==0 && $TCA[$table] && (int)$TCA[$table]['ctrl']['versioningWS']>=2) {
// Select workspace version of record:
- $rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
$fields,
$table,
'pid!=-1 AND
@@ -4179,7 +4179,7 @@
self::deleteClause($table)
);
- if (is_array($rows[0])) return $rows[0];
+ if (is_array($row)) return $row;
}
return FALSE;
Index: typo3/sysext/rsaauth/sv1/storage/class.tx_rsaauth_split_storage.php
===================================================================
--- typo3/sysext/rsaauth/sv1/storage/class.tx_rsaauth_split_storage.php (revision 7905)
+++ typo3/sysext/rsaauth/sv1/storage/class.tx_rsaauth_split_storage.php (revision )
@@ -69,7 +69,7 @@
'crdate<' . ($GLOBALS['EXEC_TIME'] - 30 * 60));
// Get our value
- list($row) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('key_value',
+ $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('key_value',
'tx_rsaauth_keys', 'uid=' . $keyId);
if (is_array($row)) {
$result = $keyPart1 . $row['key_value'];
Index: typo3/sysext/version/ws/class.wslib_gui.php
===================================================================
--- typo3/sysext/version/ws/class.wslib_gui.php (revision 9161)
+++ typo3/sysext/version/ws/class.wslib_gui.php (revision )
@@ -647,7 +647,7 @@
$this->formatWorkspace_cache[$wsid] = ''; // Does not output anything for ONLINE because it might confuse people to think that the elemnet IS online which is not the case - only that it exists as an offline version in the online workspace...
break;
default:
- list($titleRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('title','sys_workspace','uid='.intval($wsid).t3lib_BEfunc::deleteClause('sys_workspace'));
+ $titleRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('title','sys_workspace','uid='.intval($wsid).t3lib_BEfunc::deleteClause('sys_workspace'));
$this->formatWorkspace_cache[$wsid] = '['.$wsid.'] '.$titleRec['title'];
break;
}
Index: typo3/sysext/openid/sv1/class.tx_openid_sv1.php
===================================================================
--- typo3/sysext/openid/sv1/class.tx_openid_sv1.php (revision 7905)
+++ typo3/sysext/openid/sv1/class.tx_openid_sv1.php (revision )
@@ -305,7 +305,7 @@
protected function getUserRecord($openIDIdentifier) {
$record = null;
if ($openIDIdentifier) {
- list($record) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*',
+ $record = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*',
$this->authenticationInformation['db_user']['table'],
'tx_openid_openid=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($openIDIdentifier, $this->authenticationInformation['db_user']['table']) .
$this->authenticationInformation['db_user']['check_pid_clause'] .
Index: t3lib/class.t3lib_refindex.php
===================================================================
--- t3lib/class.t3lib_refindex.php (revision 8763)
+++ t3lib/class.t3lib_refindex.php (revision )
@@ -178,7 +178,7 @@
if (isset($TCA[$table])) {
// Get raw record from DB:
- list($record) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*',$table,'uid='.intval($uid));
+ $record = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*',$table,'uid='.intval($uid));
if (is_array($record)) {
@@ -638,7 +638,7 @@
if (($GLOBALS['BE_USER']->workspace===0 && $GLOBALS['BE_USER']->isAdmin()) || $bypassWorkspaceAdminCheck) {
// Get current index from Database:
- list($refRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $refRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
'sys_refindex',
'hash='.$GLOBALS['TYPO3_DB']->fullQuoteStr($hash,'sys_refindex')
@@ -649,7 +649,7 @@
if ($GLOBALS['TCA'][$refRec['tablename']]) {
// Get that record from database:
- list($record) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*',$refRec['tablename'],'uid='.intval($refRec['recuid']));
+ $record = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*',$refRec['tablename'],'uid='.intval($refRec['recuid']));
if (is_array($record)) {
Index: typo3/sysext/indexed_search/class.crawler.php
===================================================================
--- typo3/sysext/indexed_search/class.crawler.php (revision 8742)
+++ typo3/sysext/indexed_search/class.crawler.php (revision )
@@ -221,7 +221,7 @@
if ($params['indexConfigUid']) {
// Load the indexing configuration record:
- list($cfgRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $cfgRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
'index_config',
'uid='.intval($params['indexConfigUid'])
Index: typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
===================================================================
--- typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php (revision 9302)
+++ typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php (revision )
@@ -537,7 +537,7 @@
// Create header if we are searching more than one indexing configuration:
if (count($indexCfgs)>1) {
if ($freeIndexUid>0) {
- list($indexCfgRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('title','index_config','uid='.intval($freeIndexUid).$this->cObj->enableFields('index_config'));
+ $indexCfgRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('title','index_config','uid='.intval($freeIndexUid).$this->cObj->enableFields('index_config'));
$titleString = $indexCfgRec['title'];
} else {
$titleString = $this->pi_getLL('opt_freeIndexUid_header_'.$freeIndexUid);
@@ -1026,7 +1026,7 @@
if ($freeIndexUid>=0) {
// First, look if the freeIndexUid is a meta configuration:
- list($indexCfgRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('indexcfgs','index_config','type=5 AND uid='.intval($freeIndexUid).$this->cObj->enableFields('index_config'));
+ $indexCfgRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('indexcfgs','index_config','type=5 AND uid='.intval($freeIndexUid).$this->cObj->enableFields('index_config'));
if (is_array($indexCfgRec)) {
$refs = t3lib_div::trimExplode(',',$indexCfgRec['indexcfgs']);
$list = array(-99); // Default value to protect against empty array.
@@ -1034,7 +1034,7 @@
list($table,$uid) = t3lib_div::revExplode('_',$ref,2);
switch ($table) {
case 'index_config':
- list($idxRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid','index_config','uid='.intval($uid).$this->cObj->enableFields('index_config'));
+ $idxRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('uid','index_config','uid='.intval($uid).$this->cObj->enableFields('index_config'));
if ($idxRec) $list[] = $uid;
break;
case 'pages':
@@ -2168,10 +2168,10 @@
} else { // ... otherwise, get flag from sys_language record:
// Get sys_language record
- $rowDat = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_language', 'uid='.intval($row['sys_language_uid']).' '.$this->cObj->enableFields('sys_language'));
+ $rowDat = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', 'sys_language', 'uid='.intval($row['sys_language_uid']).' '.$this->cObj->enableFields('sys_language'));
// Flag code:
- $flag = $rowDat[0]['flag'];
+ $flag = $rowDat['flag'];
if ($flag) {
// FIXME not all flags from typo3/gfx/flags are available in media/flags/
@@ -2183,7 +2183,7 @@
# $imgInfo = @getimagesize(PATH_site.$file);
if (is_array($imgInfo)) {
- $output = '';
+ $output = '';
return $output;
}
}
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php (revision 9387)
+++ typo3/sysext/cms/tslib/class.tslib_content.php (revision )
@@ -1379,7 +1379,10 @@
$a1 = '';
$a2 = '';
$content = $string;
- if ($this->stdWrap($conf['enable'], $conf['enable.'])) {
+ $enable = isset($conf['enable.'])
+ ? $this->stdWrap($conf['enable'], $conf['enable.'])
+ : $conf['enable.'];
+ if ($enable) {
$content = $this->typolink($string, $conf['typolink.']);
$imageFile = $this->stdWrap($imageFile, $conf['file.']);
@@ -6906,7 +6909,7 @@
);
$requestHash = md5(serialize($parameters));
- list ($cacheEntry) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $cacheEntry = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'treelist',
'cache_treelist',
'md5hash = \'' . $requestHash . '\' AND ( expires > ' . $GLOBALS['EXEC_TIME'] .
Index: typo3/sysext/cms/tslib/class.tslib_fe.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fe.php (revision 9310)
+++ typo3/sysext/cms/tslib/class.tslib_fe.php (revision )
@@ -1709,7 +1709,7 @@
}
// Look for keyword configuration record:
- list($previewData) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $previewData = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
'sys_preview',
'keyword='.$GLOBALS['TYPO3_DB']->fullQuoteStr($inputCode, 'sys_preview').
Index: typo3/sysext/openid/sv1/class.tx_openid_store.php
===================================================================
--- typo3/sysext/openid/sv1/class.tx_openid_store.php (revision 7906)
+++ typo3/sysext/openid/sv1/class.tx_openid_store.php (revision )
@@ -97,7 +97,7 @@
else {
$sort = 'tstamp DESC';
}
- list($row) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,content',
+ $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('uid,content',
self::ASSOCIATION_TABLE_NAME, $where, '', $sort, '1');
$result = null;
@@ -187,7 +187,7 @@
$GLOBALS['TYPO3_DB']->fullQuoteStr($serverUrl, self::ASSOCIATION_TABLE_NAME),
$GLOBALS['TYPO3_DB']->fullQuoteStr($association->handle, self::ASSOCIATION_TABLE_NAME),
time());
- list($row) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'COUNT(*) as assocCount', self::ASSOCIATION_TABLE_NAME, $where);
return ($row['assocCount'] > 0);
}
Index: typo3/sysext/em/classes/database/class.tx_em_database.php
===================================================================
--- typo3/sysext/em/classes/database/class.tx_em_database.php (revision 9402)
+++ typo3/sysext/em/classes/database/class.tx_em_database.php (revision )
@@ -215,9 +215,9 @@
* @param int $uid repository UID
*/
public function getRepositoryByUID($uid) {
- $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', self::TABLE_REPOSITORY, 'uid=' . intval($uid));
+ $row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', self::TABLE_REPOSITORY, 'uid=' . intval($uid));
- return $row[0];
+ return $row;
}
/**
@@ -227,7 +227,7 @@
* @return
*/
public function getRepositoryByTitle($title) {
- return $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ return $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRows(
'*',
self::TABLE_REPOSITORY,
'title=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($title,
Index: tests/t3lib/cache/backend/t3lib_cache_backend_dbbackendTest.php
===================================================================
--- tests/t3lib/cache/backend/t3lib_cache_backend_dbbackendTest.php (revision 8564)
+++ tests/t3lib/cache/backend/t3lib_cache_backend_dbbackendTest.php (revision )
@@ -165,7 +165,7 @@
$this->backend->setCache($cache);
$this->backend->set($entryIdentifier, $data);
- $entriesFound = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $entryFound = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
$this->testingCacheTable,
'identifier = \'' . $entryIdentifier . '\''
@@ -173,7 +173,7 @@
$this->assertEquals(
$data,
- $entriesFound[0]['content'],
+ $entryFound['content'],
'The original and the retrieved data don\'t match.'
);
}
@@ -266,13 +266,13 @@
$this->backend->set($entryIdentifier, $data);
- $entry = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $entry = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'content',
$this->testingCacheTable,
'identifier = \'' . $entryIdentifier . '\''
);
- $this->assertEquals($data, @gzuncompress($entry[0]['content']), 'Original and compressed data don\'t match');
+ $this->assertEquals($data, @gzuncompress($entry['content']), 'Original and compressed data don\'t match');
}
/**
@@ -296,13 +296,13 @@
$this->backend->set($entryIdentifier, $data);
- $entry = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $entry = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'content',
$this->testingCacheTable,
'identifier = \'' . $entryIdentifier . '\''
);
- $this->assertGreaterThan(0, substr_count($entry[0]['content'], $data), 'Plaintext data not found');
+ $this->assertGreaterThan(0, substr_count($entry['content'], $data), 'Plaintext data not found');
}
/**
@@ -690,15 +690,15 @@
$this->backend->setCache($cache);
$this->backend->set($entryIdentifier, $data, array(), 0);
- $entriesFound = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $entryFound = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'*',
$this->testingCacheTable,
''
);
- $this->assertTrue(is_array($entriesFound), 'entriesFound is not an array.');
+ $this->assertTrue(is_array($entryFound), 'entriesFound is not an array.');
- $retrievedData = $entriesFound[0]['content'];
+ $retrievedData = $entryFound['content'];
$this->assertEquals($data, $retrievedData, 'The original and the retrieved data don\'t match.');
}
}
Index: t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
===================================================================
--- t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php (revision 8730)
+++ t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php (revision )
@@ -171,21 +171,19 @@
public function get($entryIdentifier) {
$cacheEntry = false;
- $cacheEntries = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
+ $cacheEntry = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
'content',
$this->cacheTable,
'identifier = ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($entryIdentifier, $this->cacheTable) . ' '
. 'AND (crdate + lifetime >= ' . $GLOBALS['EXEC_TIME'] . ' OR lifetime = 0)'
);
- if (count($cacheEntries) == 1) {
- $cacheEntry = $cacheEntries[0]['content'];
+ if ($this->compression && strlen($cacheEntry['content'])) {
+ $cacheEntry = gzuncompress($cacheEntry['content']);
+ } else {
+ $cacheEntry = $cacheEntry['content'];
}
- if ($this->compression && strlen($cacheEntry)) {
- $cacheEntry = gzuncompress($cacheEntry);
- }
-
return $cacheEntry;
}
Index: typo3/sysext/version/cm1/index.php
===================================================================
--- typo3/sysext/version/cm1/index.php (revision 9367)
+++ typo3/sysext/version/cm1/index.php (revision )
@@ -1134,7 +1134,7 @@
$this->formatWorkspace_cache[$wsid] = ''; // Does not output anything for ONLINE because it might confuse people to think that the elemnet IS online which is not the case - only that it exists as an offline version in the online workspace...
break;
default:
- list($titleRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('title','sys_workspace','uid='.intval($wsid).t3lib_BEfunc::deleteClause('sys_workspace'));
+ $titleRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('title','sys_workspace','uid='.intval($wsid).t3lib_BEfunc::deleteClause('sys_workspace'));
$this->formatWorkspace_cache[$wsid] = '['.$wsid.'] '.$titleRec['title'];
break;
}
Index: typo3/sysext/cms/class.tx_cms_be_layout.php
===================================================================
--- typo3/sysext/cms/class.tx_cms_be_layout.php (revision 9396)
+++ typo3/sysext/cms/class.tx_cms_be_layout.php (revision )
@@ -65,8 +65,7 @@
$rootline = t3lib_BEfunc::BEgetRootLine($id);
$backendLayoutUid = null;
for ($i = count($rootline); $i > 0; $i--) {
- $res = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,be_layout,be_layout_next_level', 'pages', 'uid=' . intval($rootline[$i]['uid']));
- $page = $res[0];
+ $page = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('uid,be_layout,be_layout_next_level', 'pages', 'uid=' . intval($rootline[$i]['uid']));
if (intval($page['be_layout_next_level']) > 0 && $page['uid'] != $id) {
$backendLayoutUid = intval($page['be_layout_next_level']);
break;
@@ -79,9 +78,8 @@
}
$backendLayout = null;
if ($backendLayoutUid) {
- $res = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'be_layouts', 'uid=' . $backendLayoutUid);
- if ($res) {
- $backendLayout = $res[0];
+ $backendLayout = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', 'be_layouts', 'uid=' . $backendLayoutUid);
+ if ($backendLayout) {
$parser = t3lib_div::makeInstance('t3lib_TSparser');
$parser->parse($backendLayout['config']);
$backendLayout['__config'] = $parser->setup;