Index: class.tx_dam_browse_media.php
===================================================================
--- class.tx_dam_browse_media.php (revision 28234)
+++ class.tx_dam_browse_media.php (working copy)
@@ -263,14 +263,14 @@
'QueryArray' => $this->damSC->selection->qg->getQueryParts()
);
- if (version_compare(TYPO3_version, '4.3.0', '<')) {
- $debugArr['SLCMD'] = t3lib_div::GParrayMerged('SLCMD');
- $debugArr['PM'] = t3lib_div::GParrayMerged('PM');
- }
- else {
+ if (t3lib_div::compat_version('4.3')) {
$debugArr['SLCMD'] = t3lib_div::_GPmerged('SLCMD');
$debugArr['PM'] = t3lib_div::_GPmerged('PM');
}
+ else {
+ $debugArr['SLCMD'] = t3lib_div::GParrayMerged('SLCMD');
+ $debugArr['PM'] = t3lib_div::GParrayMerged('PM');
+ }
$this->damSC->debugContent['browse_links'] = '
EB SETTINGS
'.t3lib_div::view_array($debugArr);
Index: lib/class.tx_dam_selection.php
===================================================================
--- lib/class.tx_dam_selection.php (revision 28234)
+++ lib/class.tx_dam_selection.php (working copy)
@@ -197,11 +197,11 @@
$this->hasChanged = true;
} else {
$this->setCurrentSelectionFromStored();
- if (version_compare(TYPO3_version, '4.3.0', '<')) {
- $sel = t3lib_div::GParrayMerged($this->paramStr);
+ if (t3lib_div::compat_version('4.3')) {
+ $sel = t3lib_div::_GPmerged($this->paramStr);
}
else {
- $sel = t3lib_div::_GPmerged($this->paramStr);
+ $sel = t3lib_div::GParrayMerged($this->paramStr);
}
if ($sel) {
$oldSel = serialize($this->sel);
Index: lib/class.tx_dam_scbase.php
===================================================================
--- lib/class.tx_dam_scbase.php (revision 28234)
+++ lib/class.tx_dam_scbase.php (working copy)
@@ -238,11 +238,11 @@
// check if tx_dam_folder was set by GP which takes precedence, if not use command sent by navframe
// order: GP (script), SLCMD (navframe), MOD_SETTINGS (stored)
- if (version_compare(TYPO3_version, '4.3.0', '<')) {
- $SLCMD = t3lib_div::GParrayMerged('SLCMD');
+ if (t3lib_div::compat_version('4.3')) {
+ $SLCMD = t3lib_div::_GPmerged('SLCMD');
}
else {
- $SLCMD = t3lib_div::_GPmerged('SLCMD');
+ $SLCMD = t3lib_div::GParrayMerged('SLCMD');
}
if (!$SET['tx_dam_folder'] AND is_array($SLCMD['SELECT']) AND is_array($SLCMD['SELECT']['txdamFolder'])) {
Index: ChangeLog
===================================================================
--- ChangeLog (revision 28240)
+++ ChangeLog (working copy)
@@ -1,4 +1,7 @@
2009-12-30 Michiel Roos
+ * Change on #11700: use t3lib_div::compat_version instead of version_compare
+
+2009-12-30 Michiel Roos
* Fixed bug #11700: use _GPmerged instead of GParrayMerged (Thanks to Georg Ringer)
* Fixed bug #12538: Generated contain an invalid relational operator [DBAL] (Thanks to Xavier Perseguers)
* Change for #9177: Indexing files is not working in NFS Filesystems (Thanks to Ingo Schmitt, Dan Osipov)