Index: class.tx_dam_browse_media.php
===================================================================
--- class.tx_dam_browse_media.php (revision 27861)
+++ class.tx_dam_browse_media.php (working copy)
@@ -258,12 +258,19 @@
'disallowedFileTypes' => $this->disallowedFileTypes,
'addParams' => $this->addParams,
'pointer' => $this->damSC->selection->pointer->page,
- 'SLCMD' => t3lib_div::GParrayMerged('SLCMD'),
'Selection' => $this->damSC->selection->sl->sel,
'Query' => $this->damSC->selection->qg->query,
- 'QueryArray' => $this->damSC->selection->qg->getQueryParts(),
- 'PM' => t3lib_div::GParrayMerged('PM'),
+ '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 {
+ $debugArr['SLCMD'] = t3lib_div::_GPmerged('SLCMD');
+ $debugArr['PM'] = t3lib_div::_GPmerged('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 27861)
+++ lib/class.tx_dam_selection.php (working copy)
@@ -197,7 +197,13 @@
$this->hasChanged = true;
} else {
$this->setCurrentSelectionFromStored();
- if ($sel = t3lib_div::GParrayMerged($this->paramStr)) {
+ if (version_compare(TYPO3_version, '4.3.0', '<')) {
+ $sel = t3lib_div::GParrayMerged($this->paramStr);
+ }
+ else {
+ $sel = t3lib_div::_GPmerged($this->paramStr);
+ }
+ if ($sel) {
$oldSel = serialize($this->sel);
$this->mergeSelection($sel);
$this->storeCurrentSelectionAsUndo();
Index: lib/class.tx_dam_scbase.php
===================================================================
--- lib/class.tx_dam_scbase.php (revision 27861)
+++ lib/class.tx_dam_scbase.php (working copy)
@@ -237,7 +237,14 @@
// 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)
- $SLCMD = t3lib_div::GParrayMerged('SLCMD');
+
+ if (version_compare(TYPO3_version, '4.3.0', '<')) {
+ $SLCMD = t3lib_div::GParrayMerged('SLCMD');
+ }
+ else {
+ $SLCMD = t3lib_div::_GPmerged('SLCMD');
+ }
+
if (!$SET['tx_dam_folder'] AND is_array($SLCMD['SELECT']) AND is_array($SLCMD['SELECT']['txdamFolder'])) {
$this->path = tx_dam::path_makeRelative(key($SLCMD['SELECT']['txdamFolder']));
}