From a293b64c97548a0cf48723615b026e008742007d Mon Sep 17 00:00:00 2001 From: Benni Mack Date: Mon, 15 Sep 2008 04:09:09 +0000 Subject: [PATCH] Followup to #9167: Mark extension as write protected: Option now called "excludeFromUpdates" git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4120 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 1 + typo3/mod/tools/em/class.em_index.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb886728132a..27a603a681c0 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2008-09-14 Benjamin Mack + * Followup to #9167: Mark extension as write protected: Option now called "excludeFromUpdates" * Fixed Bug #8621: Whitespace and CGL cleanup for class.tx_opendocs.php (Thanks to Stefano Kowalke) * Fixed Bug #847: error in tslib_fe->getFromCache() (Thanks to Susanne Moog) diff --git a/typo3/mod/tools/em/class.em_index.php b/typo3/mod/tools/em/class.em_index.php index c2a2f994f066..e11546153971 100644 --- a/typo3/mod/tools/em/class.em_index.php +++ b/typo3/mod/tools/em/class.em_index.php @@ -249,7 +249,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase { 'experimental' => 'Experimental', 'test' => 'Test', 'obsolete' => 'Obsolete', - 'write_protected' => 'Write-protected' + 'excludeFromUpdates' => 'Exclude From Updates' ); /** @@ -262,7 +262,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase { 'experimental' => '#007eba', 'test' => '#979797', 'obsolete' => '#000000', - 'write_protected' => '#cf7307' + 'excludeFromUpdates' => '#cf7307' ); /** @@ -897,13 +897,13 @@ EXTENSION KEYS: if ($inst_list[$extKey]['type']!='S' && (!isset($inst_list[$extKey]) || $this->versionDifference($version,$inst_list[$extKey]['EM_CONF']['version'],$this->versionDiffFactor))) { if (isset($inst_list[$extKey])) { // update - if ($inst_list[$extKey]['EM_CONF']['state'] != 'write_protected') { + if ($inst_list[$extKey]['EM_CONF']['state'] != 'excludeFromUpdates') { $loc= ($inst_list[$extKey]['type']=='G'?'G':'L'); $aUrl = 'index.php?CMD[importExt]='.$extKey.'&CMD[extVersion]='.$version.'&CMD[loc]='.$loc; $loadUnloadLink.= ''; } else { - // extension is marked as write protected - $loadUnloadLink.= ''; + // extension is marked as "excludeFromUpdates" + $loadUnloadLink.= ''; } } else { // import @@ -1508,7 +1508,7 @@ EXTENSION KEYS: if ($this->importAtAll()) { // Check for write-protected extension list($inst_list,) = $this->getInstalledExtensions(); - if ($inst_list[$extKey]['EM_CONF']['state'] != 'write_protected') { + if ($inst_list[$extKey]['EM_CONF']['state'] != 'excludeFromUpdates') { $onClick = ' window.location.href=\'index.php?CMD[importExt]='.$extKey.'\' +\'&CMD[extVersion]=\'+document.pageform.extVersion.options[document.pageform.extVersion.selectedIndex].value @@ -1523,7 +1523,7 @@ EXTENSION KEYS: ' '; } else { - $select .= '

This extension is write-protected!'; + $select .= '

This extension is excluded from Updates! You can change this in the extensions\' ext_emconf.php file.'; } } else { $select .= '

' . $this->noImportMsg(); @@ -5377,7 +5377,7 @@ $EM_CONF[$_EXTKEY] = '.$this->arrayToCode($EM_CONF, 0).'; } } $content .= ''.$icon.''. -'' . ($data['EM_CONF']['state'] == 'write_protected' ? '' . $data['EM_CONF']['title'] . ' (write-protected)' : ''.$data[EM_CONF][title].'') . ''. +'' . ($data['EM_CONF']['state'] == 'excludeFromUpdates' ? '' . $data['EM_CONF']['title'] . ' (write-protected)' : ''.$data[EM_CONF][title].'') . ''. ''.$name.''. ''.$data[EM_CONF][version].''. ''.$lastversion.''. -- 2.20.1