diff --git a/t3lib/class.t3lib_iconworks.php b/t3lib/class.t3lib_iconworks.php
index 9bb967926b86f1c206d4843ceee1463fff9d1b4b..f98fe39ea47dad9f5cf2bf925f61ff622e21f10e 100644
--- a/t3lib/class.t3lib_iconworks.php
+++ b/t3lib/class.t3lib_iconworks.php
@@ -180,11 +180,6 @@ final class t3lib_iconWorks {
// First, find the icon file name. This can depend on configuration in TCA, field values and more:
if ($table == 'pages') {
- // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
- if ($row['nav_hide'] && ($row['doktype'] == t3lib_pageSelect::DOKTYPE_DEFAULT || $row['doktype'] == t3lib_pageSelect::DOKTYPE_ADVANCED)) {
- $row['doktype'] = t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU;
- } // Workaround to change the icon if "Hide in menu" was set
-
if (!$iconfile = $GLOBALS['PAGES_TYPES'][$row['doktype']]['icon']) {
$iconfile = $GLOBALS['PAGES_TYPES']['default']['icon'];
}
diff --git a/t3lib/class.t3lib_page.php b/t3lib/class.t3lib_page.php
index 83794c0474f6025f49f8e17ed60727b91148adc0..d90e3a8b1cf6134e87dd5fc338933d8a97f09b33 100644
--- a/t3lib/class.t3lib_page.php
+++ b/t3lib/class.t3lib_page.php
@@ -71,10 +71,8 @@ class t3lib_pageSelect {
* Named constants for "magic numbers" of the field doktype
*/
const DOKTYPE_DEFAULT = 1;
- const DOKTYPE_ADVANCED = 2; // @deprecated since TYPO3 4.2
const DOKTYPE_LINK = 3;
const DOKTYPE_SHORTCUT = 4;
- const DOKTYPE_HIDE_IN_MENU = 5; // @deprecated since TYPO3 4.2
const DOKTYPE_BE_USER_SECTION = 6;
const DOKTYPE_MOUNTPOINT = 7;
const DOKTYPE_SPACER = 199;
diff --git a/t3lib/class.t3lib_recordlist.php b/t3lib/class.t3lib_recordlist.php
index 09a3002db63d1adfd847603861919d3fccdc566e..bd2d1f2cf2fcbfb6ec1341d385125d73b55a1d90 100644
--- a/t3lib/class.t3lib_recordlist.php
+++ b/t3lib/class.t3lib_recordlist.php
@@ -49,7 +49,6 @@ class t3lib_recordList {
var $leftMargin = 0; // OBSOLETE - NOT USED ANYMORE. leftMargin
var $showIcon = 1;
var $no_noWrap = 0;
- var $oddColumnsTDParams = ''; // Deprecated since TYPO3 4.2, remove in 4.4. If set this is <td>-params for odd columns in addElement. Used with db_layout / pages section
var $oddColumnsCssClass = ''; // If set this is <td> CSS-classname for odd columns in addElement. Used with db_layout / pages section
var $backPath = '';
var $fieldArray = Array(); // Decides the columns shown. Filled with values that refers to the keys of the data-array. $this->fieldArray[0] is the title column.
diff --git a/t3lib/class.t3lib_rteapi.php b/t3lib/class.t3lib_rteapi.php
index eeef97ec75422f3e6dbf8bb6f1232d71cbb5bc09..0ca2fa3d89f72d22bb6aa0ea25c6e47118ac4e78 100644
--- a/t3lib/class.t3lib_rteapi.php
+++ b/t3lib/class.t3lib_rteapi.php
@@ -166,14 +166,6 @@ class t3lib_rteapi {
}
}
-/**
- * @deprecated since TYPO3 4.4: Use XCLASS t3lib/class.t3lib_rteapi.php instead. Will be removed in TYPO3 4.6.
- */
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php'])) {
- t3lib_div::deprecationLog('XCLASS "ext/rte/class.tx_rte_base.php" is deprecated since TYPO3 4.4 - use "t3lib/class.t3lib_rteapi.php" instead.');
- include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php']);
-}
-
if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_rteapi.php'])) {
include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_rteapi.php']);
}
diff --git a/t3lib/class.t3lib_spritemanager.php b/t3lib/class.t3lib_spritemanager.php
index def7e1f2c7908f53bd3afbc8917928857940406f..fa2e83bf843d5e07bb529936578088d27c8a79d2 100644
--- a/t3lib/class.t3lib_spritemanager.php
+++ b/t3lib/class.t3lib_spritemanager.php
@@ -147,9 +147,9 @@ class t3lib_SpriteManager {
/**
* Backwards compatibility methods, log usage to deprecation log.
- * Will be removed in 4.7
*
* @return void
+ * @deprecated since TYPO3 4.4: Will be removed in 4.7
*/
private function compatibilityCalls() {
// Fallback for $TYPE_ICONS "contains-module" icons
diff --git a/t3lib/class.t3lib_stdgraphic.php b/t3lib/class.t3lib_stdgraphic.php
index af7c0c46b1b32d63c530acf8863715d4830b70c9..77708c5b0827f2f05baa0f2cbf98ea76df1f829b 100644
--- a/t3lib/class.t3lib_stdgraphic.php
+++ b/t3lib/class.t3lib_stdgraphic.php
@@ -50,7 +50,6 @@ class t3lib_stdGraphic {
// Internal configuration, set in init()
var $combineScript = 'combine'; // The ImageMagick filename used for combining two images. This name changed during the versions.
var $noFramePrepended = 0; // If set, there is no frame pointer prepended to the filenames.
- var $GD2 = 1; // Set, if the GDlib used is version 2. @deprecated as of TYPO3 4.4, as this variables is now always set (GDlib2 always has this method, and PHP recommends to only use imagecreatetruecolor() over imagecreate())
var $imagecopyresized_fix = 0; // If set, imagecopyresized will not be called directly. For GD2 (some PHP installs?)
var $gifExtension = 'gif'; // This should be changed to 'png' if you want this class to read/make PNG-files instead!
var $gdlibExtensions = ''; // File formats supported by gdlib. This variable get's filled in "init" method
diff --git a/t3lib/class.t3lib_tceforms.php b/t3lib/class.t3lib_tceforms.php
index 605b70dda5bb10c1834686e11a82ae2fea6e32d6..175a28d94adfe23b9b522dc1bcbfcb214edc57ef 100644
--- a/t3lib/class.t3lib_tceforms.php
+++ b/t3lib/class.t3lib_tceforms.php
@@ -62,7 +62,6 @@ class t3lib_TCEforms {
var $loadMD5_JS = 1;
var $prevBorderStyle = '[nothing here...]'; // Something unique...
var $allowUpload = 0; // If set direct upload fields will be shown
- var $titleLen = 15; // @deprecated since TYPO3 4.1: $GLOBALS['BE_USER']->uc['titleLen'] but what is default??
var $defaultLanguageData = array(); // Array where records in the default language is stored. (processed by transferdata)
var $defaultLanguageData_diff = array(); // Array where records in the default language is stored (raw without any processing. used for making diff)
var $additionalPreviewLanguageData = array();
@@ -257,7 +256,6 @@ class t3lib_TCEforms {
$this->edit_showFieldHelp = $GLOBALS['BE_USER']->uc['edit_showFieldHelp'];
$this->edit_docModuleUpload = $GLOBALS['BE_USER']->uc['edit_docModuleUpload'];
- $this->titleLen = $GLOBALS['BE_USER']->uc['titleLen']; // @deprecated since TYPO3 4.1
$this->inline->init($this);
$this->suggest->init($this);
diff --git a/t3lib/class.t3lib_tceforms_inline.php b/t3lib/class.t3lib_tceforms_inline.php
index 394fda2726a5b71e8cb6c91dd7812ee85918dc0f..30557ad3708bedad702e1e554b74b65be6120ef5 100644
--- a/t3lib/class.t3lib_tceforms_inline.php
+++ b/t3lib/class.t3lib_tceforms_inline.php
@@ -1874,11 +1874,6 @@ class t3lib_TCEforms_inline {
// Init appearance if not set:
if (!isset($config['appearance']) || !is_array($config['appearance'])) {
$config['appearance'] = array();
- }
- // 'newRecordLinkPosition' is deprecated since TYPO3 4.2.0-beta1, this is for backward compatibility:
- if (!isset($config['appearance']['levelLinksPosition']) && isset($config['appearance']['newRecordLinkPosition']) && $config['appearance']['newRecordLinkPosition']) {
- t3lib_div::deprecationLog('TCA contains a deprecated definition using "newRecordLinkPosition"');
- $config['appearance']['levelLinksPosition'] = $config['appearance']['newRecordLinkPosition'];
}
// Set the position/appearance of the "Create new record" link:
if (isset($config['foreign_selector']) && $config['foreign_selector'] && (!isset($config['appearance']['useCombination']) || !$config['appearance']['useCombination'])) {
diff --git a/t3lib/class.t3lib_tcemain.php b/t3lib/class.t3lib_tcemain.php
index 9beb7fd1863593e9638f3b7ef856bbfe53a9153f..d6a06a22e86b4895343bf8b0f22436b51701a689 100644
--- a/t3lib/class.t3lib_tcemain.php
+++ b/t3lib/class.t3lib_tcemain.php
@@ -3302,7 +3302,7 @@ class t3lib_TCEmain {
// In case the record to be moved turns out to be an offline version,
// we have to find the live version and work on that one (this case
// happens for pages with "branch" versioning type)
- // note: as "branch" versioning is deprecated since TYPO3 4.2, this
+ // @deprecated note: as "branch" versioning is deprecated since TYPO3 4.2, this
// functionality will be removed in TYPO3 4.7 (note by benni: a hook could replace this)
if ($lookForLiveVersion = t3lib_BEfunc::getLiveVersionOfRecord($table, $uid, 'uid')) {
$uid = $lookForLiveVersion['uid'];
diff --git a/t3lib/config_default.php b/t3lib/config_default.php
index c0110bae9ad9d180725ef5827e6700ac3f1543e8..c7d976a370dc3d0f81d24529042281366cf30965 100644
--- a/t3lib/config_default.php
+++ b/t3lib/config_default.php
@@ -646,7 +646,7 @@ $TYPO3_CONF_VARS = array(
$T3_VAR = array(); // Initialize.
// TYPO3 version
-$TYPO_VERSION = '4.6-dev'; // deprecated: use the constants defined below
+$TYPO_VERSION = '4.6-dev'; // @deprecated: Will be removed in TYPO3 4.8. Use the constants defined below
define('TYPO3_version', $TYPO_VERSION);
define('TYPO3_branch', '4.6');
define('TYPO3_copyright_year', '1998-2011');
diff --git a/t3lib/stddb/tables.php b/t3lib/stddb/tables.php
index e181b59d6ae22e4ae1d8823045affb7b66fdd764..e25a212da2f22255bbfd79ad197abbde2d09fbd3 100644
--- a/t3lib/stddb/tables.php
+++ b/t3lib/stddb/tables.php
@@ -52,15 +52,12 @@
* Here you can set the icon and especially you can define which tables are allowed on a certain pagetype (doktype)
* NOTE: The 'default' entry in the $PAGES_TYPES-array is the 'base' for all types, and for every type the entries simply overrides the entries in the 'default' type!
*
- * NOTE: usage of 'icon' is deprecated since TYPO3 4.4, use t3lib_SpriteManager::addTcaTypeIcon() instead
*/
$PAGES_TYPES = array(
(string) t3lib_pageSelect::DOKTYPE_LINK => array(
),
(string) t3lib_pageSelect::DOKTYPE_SHORTCUT => array(
),
- (string) t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU => array(
- ),
(string) t3lib_pageSelect::DOKTYPE_BE_USER_SECTION => array(
'type' => 'web',
'allowedTables' => '*'
@@ -91,7 +88,7 @@ $PAGES_TYPES = array(
* Each key is a value from the "module" field of page records and the value is an array with a key/value pair, eg. "icon" => "modules_shop.gif"
*
* @see t3lib_iconWorks::getIcon(), typo3/sysext/cms/ext_tables.php
- * @deprecated since TYPO3 4.4, use t3lib_SpriteManager::addTcaTypeIcon instead
+ * @deprecated since TYPO3 4.4, use t3lib_SpriteManager::addTcaTypeIcon instead, will be removed in TYPO3 4.7
*/
$ICON_TYPES = array();
@@ -810,4 +807,4 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['spriteIconRecordOverlayNames'] = array(
'protectedSection' => 'status-overlay-includes-subpages',
);
-?>
\ No newline at end of file
+?>
diff --git a/t3lib/stddb/tbl_pages.php b/t3lib/stddb/tbl_pages.php
index e037a8443def214f4699bef0eb37c20b173677e5..e28cf729509cc56120eeefe1e48e3f6956bcc696 100644
--- a/t3lib/stddb/tbl_pages.php
+++ b/t3lib/stddb/tbl_pages.php
@@ -835,33 +835,6 @@ $TCA['pages'] = array(
--palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.config;config,
--div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
'),
- // not in menu
- (string) t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU => array(
- 'showitem' =>
- '--palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.standard;standard,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.title;title,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.visibility;hiddenonly,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.access;access,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.metadata,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.abstract;abstract,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.metatags;metatags,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.editorial;editorial,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.appearance,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.layout;layout,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.module;module,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.replace;replace,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.behaviour,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.links;links,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.caching;caching,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.language;language,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.miscellaneous;miscellaneous,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.resources,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.media;media,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.storage;storage,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.config;config,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
- '),
// mount page
(string) t3lib_pageSelect::DOKTYPE_MOUNTPOINT => array(
'showitem' =>
@@ -1100,4 +1073,4 @@ if (!t3lib_div::compat_version('4.2')) {
');
}
-?>
\ No newline at end of file
+?>
diff --git a/t3lib/utility/class.t3lib_utility_client.php b/t3lib/utility/class.t3lib_utility_client.php
index b8cf47e96ae49f14d4c864ff0ed470c2a77b2e5e..76053aa94657fb514a7c420ec6d49a0d0bce05e5 100644
--- a/t3lib/utility/class.t3lib_utility_client.php
+++ b/t3lib/utility/class.t3lib_utility_client.php
@@ -102,7 +102,7 @@ final class t3lib_utility_Client {
}
// Microsoft Documentation about Platform tokens: http://msdn.microsoft.com/en-us/library/ms537503(VS.85).aspx
- // 'system' is deprecated, use 'all_systems' (array) in future!
+ // @deprecated: 'system' is deprecated since TYPO3 4.6, use 'all_systems' (array) in future! Will be removed in TYPO3 4.8
$browserInfo['system'] = '';
$browserInfo['all_systems'] = array();
if (strstr($userAgent, 'Win')) {
diff --git a/t3lib/utility/class.t3lib_utility_mail.php b/t3lib/utility/class.t3lib_utility_mail.php
index 69bb034514618b7a6abe4d24b6270f7dd3ddaedb..fd64100e9a76d5b243527c8a5d227cfff1ada848 100644
--- a/t3lib/utility/class.t3lib_utility_mail.php
+++ b/t3lib/utility/class.t3lib_utility_mail.php
@@ -78,7 +78,7 @@ final class t3lib_utility_Mail {
$hookSubscriberContainsArrow = strpos($hookSubscriber, '->');
if ($hookSubscriberContainsArrow !== FALSE) {
- // deprecated, remove in TYPO3 4.7
+ // @deprecated: remove in TYPO3 4.7
t3lib_div::deprecationLog(
'The usage of user function notation for the substituteMailDelivery hook is deprecated,
use the t3lib_mail_MailerAdapter interface instead.'
diff --git a/tests/t3lib/class.t3lib_pageselectTest.php b/tests/t3lib/class.t3lib_pageselectTest.php
index cdd83f6ab740df2579f6f207df62405dce6d961e..14ecea443a9a504f9bc418aad05915d03464ac1c 100644
--- a/tests/t3lib/class.t3lib_pageselectTest.php
+++ b/tests/t3lib/class.t3lib_pageselectTest.php
@@ -118,16 +118,6 @@ class t3lib_pageselectTest extends tx_phpunit_testcase {
// Tests concerning getExtURL
///////////////////////////////
- /**
- * @test
- */
- public function getExtUrlForDokType2ReturnsFalse() {
- $this->assertEquals(
- FALSE,
- $this->pageSelectObject->getExtURL(array('doktype' => t3lib_pageSelect::DOKTYPE_ADVANCED))
- );
- }
-
/**
* @test
*/
diff --git a/typo3/class.db_list_extra.inc b/typo3/class.db_list_extra.inc
index 0884080c1944edf9ad56d5b96399c86d3bc59fad..74368361ef41d51ba79024abc033662796eb2148 100644
--- a/typo3/class.db_list_extra.inc
+++ b/typo3/class.db_list_extra.inc
@@ -84,15 +84,6 @@ class localRecordList extends recordList {
var $CBnames=array(); // Tracking names of elements (for clipboard use)
var $duplicateStack=array(); // Used to track which elements has duplicates and how many
- /**
- * references of the current record
- *
- * @var array
- *
- * @deprecated since 4.4: Use getReferenceCount instead
- */
- public $references;
-
/**
* [$tablename][$uid] = number of references to this record
*
@@ -1748,10 +1739,9 @@ class localRecordList extends recordList {
* Adds selected columns of one table row as CSV line.
*
* @param array Record array, from which the values of fields found in $this->fieldArray will be listed in the CSV output.
- * @param string Table name @deprecated since 4.4
* @return void
*/
- protected function addToCSV(array $row = array(), $table = '') {
+ protected function addToCSV(array $row = array()) {
$rowReducedByControlFields = self::removeControlFieldsFromFieldRow($row);
$rowReducedToSelectedColumns = array_intersect_key($rowReducedByControlFields, array_flip($this->fieldArray));
$this->setCsvRow($rowReducedToSelectedColumns);
diff --git a/typo3/class.webpagetree.php b/typo3/class.webpagetree.php
index 970c9f0b1c9880b611d4aad3f1b1b66d97eaaa8d..abf4ddb8689f8e38533c324dbb135d3ca6cb8835 100644
--- a/typo3/class.webpagetree.php
+++ b/typo3/class.webpagetree.php
@@ -435,9 +435,8 @@ class webPageTree extends t3lib_browseTree {
$crazyRecursionLimiter--;
// Not in menu:
- // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
if ($this->ext_separateNotinmenuPages &&
- ($row['doktype'] == t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU || $row['doktype'] == t3lib_pageSelect::DOKTYPE_BE_USER_SECTION ||
+ ($row['doktype'] == t3lib_pageSelect::DOKTYPE_BE_USER_SECTION ||
$row['doktype'] >= 200 || $row['nav_hide'])) {
$outOfMenuPages[] = $row;
$outOfMenuPagesTextIndex[] = ($row['doktype']>=200 ? 'zzz'.$row['doktype'].'_' : '').$row['title'];
@@ -534,4 +533,4 @@ if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLA
include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/class.webpagetree.php']);
}
-?>
\ No newline at end of file
+?>
diff --git a/typo3/js/clickmenu.js b/typo3/js/clickmenu.js
index f8964d06e2c56ba52ee25c8b6d8b34bf59fe3e9f..ed4844e277504c67c480c2c6a92bbc6b15d200cb 100644
--- a/typo3/js/clickmenu.js
+++ b/typo3/js/clickmenu.js
@@ -222,11 +222,15 @@ var Clickmenu = {
Event.observe(document, 'mousemove', Clickmenu.calcMousePosEvent.bindAsEventListener(Clickmenu), true);
-// deprecated functions since 4.2, here for compatibility, remove in 4.4
+// @deprecated: Deprecated functions since 4.2, here for compatibility, remove in 4.4+
+// ## BEGIN ##
+
+// Still used in Core: typo3/template.php::wrapClickMenuOnIcon()
function showClickmenu(table, uid, listFr, enDisItems, backPath, addParams) {
Clickmenu.show(table, uid, listFr, enDisItems, backPath, addParams);
}
+// Still used in Core: typo3/alt_clickmenu.php::linkItem()
function showClickmenu_raw(url) {
var parts = url.split('?');
if (parts.length === 2) {
@@ -254,3 +258,4 @@ function hideSpecific(level) {
function showHideSelectorBoxes(action) {
toggleSelectorBoxes(action);
}
+// ## END ##
diff --git a/typo3/js/tree.js b/typo3/js/tree.js
index 71c4f365f6a914d7a8da49d7dbb1fd64d4d279f9..510aac39d0d9404d05bce1a8f5a2f3492ced06bf 100644
--- a/typo3/js/tree.js
+++ b/typo3/js/tree.js
@@ -307,6 +307,7 @@ function refresh_nav() {
// Deprecated since 4.1.
// Another JS function, for highlighting rows in the page tree, kept alive for backwards
// compatibility. Please use the function in the "Tree" object for future implementations.
+// Still used in Core file_list.inc::linkWrapDir()
function hilight_row(frameSetModule, highLightID) {
Tree.highlightActiveItem(frameSetModule, highLightID);
}
diff --git a/typo3/jsfunc.tbe_editor.js b/typo3/jsfunc.tbe_editor.js
index f906a31087a12b92a36ca911610b7a81c35488ba..f3357bbe3b081083287c9d7b5640fb181f9ddbb9 100644
--- a/typo3/jsfunc.tbe_editor.js
+++ b/typo3/jsfunc.tbe_editor.js
@@ -341,13 +341,6 @@ var TBE_EDITOR = {
return true;
}
},
- /**
- * This function is not used by core and will be removed in version 4.6
- * @deprecated
- */
- setHiddenContent: function(RTEcontent,theField) {
- document[TBE_EDITOR.formname][theField].value = RTEcontent;
- },
fieldChanged_fName: function(fName,el) {
var idx=2+TBE_EDITOR.prependFormFieldNamesCnt;
var table = TBE_EDITOR.split(fName, "[", idx);
diff --git a/typo3/sysext/cms/tbl_cms.php b/typo3/sysext/cms/tbl_cms.php
index 10dc1c917a7cee0b9be56a7d3a1f77d242539c4f..974b2226e3814d2766fc2db94dca0fffeef72169 100755
--- a/typo3/sysext/cms/tbl_cms.php
+++ b/typo3/sysext/cms/tbl_cms.php
@@ -760,22 +760,6 @@ $TCA['pages_language_overlay'] = array(
--palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.media;media,
--div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
'),
- // not in menu
- (string) t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU => array(
- 'showitem' =>
- '--palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.standard;standard,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.title;title,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.visibility;hiddenonly,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.access;access,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.metadata,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.abstract;abstract,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.metatags;metatags,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.editorial;editorial,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.resources,
- --palette--;LLL:EXT:cms/locallang_tca.xml:pages.palettes.media;media,
- --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.extended,
- '),
// mount page
(string) t3lib_pageSelect::DOKTYPE_MOUNTPOINT => array(
'showitem' =>
@@ -1203,4 +1187,4 @@ $TCA['backend_layout'] = array(
);
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/cms/tslib/class.tslib_adminpanel.php b/typo3/sysext/cms/tslib/class.tslib_adminpanel.php
index 7d8e83461925fbee9fe65d06bf7e433deaf27a00..f37efbfbefa018a40e98c72571d643948e956563 100644
--- a/typo3/sysext/cms/tslib/class.tslib_adminpanel.php
+++ b/typo3/sysext/cms/tslib/class.tslib_adminpanel.php
@@ -173,16 +173,6 @@ class tslib_AdminPanel {
if ($this->extGetFeAdminValue('cache', 'noCache')) {
$GLOBALS['TSFE']->set_no_cache();
}
-
- // Hook for post processing the frontend admin configuration. Added with TYPO3 4.2, so naming is now incorrect but preserves compatibility.
- // @deprecated since TYPO3 4.3
- if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extSaveFeAdminConfig-postProc'])) {
- t3lib_div::deprecationLog('Frontend admin post processing hook extSaveFeAdminConfig-postProc is deprecated since TYPO3 4.3.');
- $_params = array('input' => &$input, 'pObj' => &$this);
- foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extSaveFeAdminConfig-postProc'] as $_funcRef) {
- t3lib_div::callUserFunction($_funcRef, $_params, $this);
- }
- }
}
/**
@@ -221,16 +211,6 @@ class tslib_AdminPanel {
if ($this->isAdminModuleOpen($sectionName)) { // See if the menu is expanded!
return $retVal;
}
-
- // Hook for post processing the frontend admin configuration. Added with TYPO3 4.2, so naming is now incorrect but preserves compatibility.
- // @deprecated since TYPO3 4.3
- if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction-postProc'])) {
- t3lib_div::deprecationLog('Frontend admin post processing hook extEditAction-postProc is deprecated since TYPO3 4.3.');
- $params = array('cmd' => &$cmd, 'tce' => &$this->tce, 'pObj' => &$this);
- foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php']['extEditAction-postProc'] as $funcRef) {
- t3lib_div::callUserFunction($funcRef, $params, $this);
- }
- }
}
}
diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 0c2e7a8612492e6ac507582abcc208939b100d04..f06824ca390ed30994608c7d25980909e2f40b7d 100644
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -5061,9 +5061,6 @@ class tslib_cObj {
if ((string) $key != '') {
$type = strtolower(trim($parts[0]));
switch ($type) {
- case 'gpvar' :
- t3lib_div::deprecationLog('Using gpvar in TypoScript getText is deprecated since TYPO3 4.3 - Use gp instead of gpvar.');
- // Fall Through
case 'gp' :
// Merge GET and POST and get $key out of the merged array
$retVal = $this->getGlobal($key, t3lib_div::array_merge_recursive_overrule(t3lib_div::_GET(), t3lib_div::_POST()));
diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index 6715aca207f87333cd3ee7c7a7ce6415868d8128..f57206049e2e62e35cacd17a021a1206d8cdc157 100644
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -145,13 +145,6 @@
'onload' => array(),
'onunload' => array(),
);
- /**
- * Adds JavaScript code
- *
- * @var string
- * @deprecated since TYPO3 3.5 - use additionalJavaScript instead.
- */
- var $JSCode='';
var $JSImgCode=''; // Used to accumulate JavaScript loaded images (by menus)
var $divSection=''; // Used to accumulate DHTML-layers.
var $defaultBodyTag='<body>'; // Default bodytag, if nothing else is set. This can be overridden by applications like TemplaVoila.
@@ -194,12 +187,6 @@
var $uniqueString='';
var $indexedDocTitle=''; // This value will be used as the title for the page in the indexer (if indexing happens)
var $altPageTitle=''; // Alternative page title (normally the title of the page record). Can be set from applications you make.
- /**
- * An array that holds parameter names (keys) of GET parameters which MAY be MD5/base64 encoded with simulate_static_documents method.
- * @var array
- * @deprecated since TYPO3 4.3, remove in TYPO3 4.5
- */
- var $pEncAllowedParamNames=array();
var $baseUrl=''; // The base URL set for the page header.
var $anchorPrefix=''; // The proper anchor prefix needed when using speaking urls. (only set if baseUrl is set)
@@ -3082,10 +3069,10 @@
*/
function INTincScript() {
// Deprecated stuff:
+ // @deprecated: annotation added TYPO3 4.6
$this->additionalHeaderData = is_array($this->config['INTincScript_ext']['additionalHeaderData']) ? $this->config['INTincScript_ext']['additionalHeaderData'] : array();
$this->additionalJavaScript = $this->config['INTincScript_ext']['additionalJavaScript'];
$this->additionalCSS = $this->config['INTincScript_ext']['additionalCSS'];
- $this->JSCode = $this->additionalHeaderData['JSCode'];
$this->JSImgCode = $this->additionalHeaderData['JSImgCode'];
$this->divSection='';
@@ -3184,17 +3171,6 @@
if (version == "n3") {
'.trim($this->JSImgCode).'
}
-// -->
- /*]]>*/
-</script>';
- }
- if ($this->JSCode || count($this->additionalJavaScript)) { // Add javascript
- $this->additionalHeaderData['JSCode']='
-<script type="text/javascript">
- /*<![CDATA[*/
-<!--
-'.implode(LF,$this->additionalJavaScript).'
-'.trim($this->JSCode).'
// -->
/*]]>*/
</script>';
diff --git a/typo3/sysext/cms/tslib/class.tslib_fetce.php b/typo3/sysext/cms/tslib/class.tslib_fetce.php
index 12d9be1302a6398e43aaa19a75a8ccedd1e52bdf..4024089943ab64f668b9ce9da9aa9b9a3be3040d 100644
--- a/typo3/sysext/cms/tslib/class.tslib_fetce.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fetce.php
@@ -58,7 +58,7 @@
* @author Kasper Skårhøj <kasperYYYY@typo3.com>
* @package TYPO3
* @subpackage tslib
- * @deprecated since TYPO3 3.6
+ * @deprecated since TYPO3 3.6, will be removed in TYPO3 4.8
*/
class tslib_feTCE {
@@ -67,6 +67,10 @@ class tslib_feTCE {
var $newData=array();
var $extraList = 'pid';
+ public function __construct() {
+ t3lib_div::logDeprecatedFunction();
+ }
+
/**
* Starting the processing of user input.
* Traverses the input data and fills in the array, $this->extScripts with references to files which are then included by includeScripts() (called AFTER start() in tslib_fe)
diff --git a/typo3/sysext/cms/tslib/class.tslib_menu.php b/typo3/sysext/cms/tslib/class.tslib_menu.php
index 69dc9731fde5ec60d1a26d279be25f2352b9f9c9..31efddbbc4026a4e8e640f4140cc57e319d7171e 100644
--- a/typo3/sysext/cms/tslib/class.tslib_menu.php
+++ b/typo3/sysext/cms/tslib/class.tslib_menu.php
@@ -76,8 +76,7 @@ class tslib_menu {
var $menuNumber = 1; // tells you which menu-number this is. This is important when getting data from the setup
var $entryLevel = 0; // 0 = rootFolder
var $spacerIDList = '199'; // The doktype-number that defines a spacer
- // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
- var $doktypeExcludeList = '5,6'; // doktypes that define which should not be included in a menu
+ var $doktypeExcludeList = '6'; // doktypes that define which should not be included in a menu
var $alwaysActivePIDlist=array();
var $imgNamePrefix = 'img';
var $imgNameNotRandom=0;
@@ -174,12 +173,6 @@ class tslib_menu {
// 'not in menu' doktypes
if($this->conf['excludeDoktypes']) {
$this->doktypeExcludeList = $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['excludeDoktypes']);
- }
- if($this->conf['includeNotInMenu']) {
- $exclDoktypeArr = t3lib_div::trimExplode(',',$this->doktypeExcludeList,1);
- // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
- $exclDoktypeArr = t3lib_div::removeArrayEntryByValue($exclDoktypeArr,'5');
- $this->doktypeExcludeList = implode(',',$exclDoktypeArr);
}
// EntryLevel
$this->entryLevel = tslib_cObj::getKey (
diff --git a/typo3/sysext/cms/tslib/class.tslib_pagegen.php b/typo3/sysext/cms/tslib/class.tslib_pagegen.php
index d6fb076e3be939f268271de206f3cc551afed863..001c8947cb22e9160671ac657ee98b5a900869fa 100644
--- a/typo3/sysext/cms/tslib/class.tslib_pagegen.php
+++ b/typo3/sysext/cms/tslib/class.tslib_pagegen.php
@@ -95,7 +95,7 @@ class TSpagegen {
// Base url:
if ($GLOBALS['TSFE']->config['config']['baseURL']) {
if ($GLOBALS['TSFE']->config['config']['baseURL']==='1') {
- // Deprecated property, going to be dropped in TYPO3 4.7.
+ // @deprecated: Deprecated property, going to be dropped in TYPO3 4.7.
$error = 'Unsupported TypoScript property was found in this template: "config.baseURL="1"
This setting has been deprecated in TYPO 3.8.1 due to security concerns.
diff --git a/typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc b/typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc
index 66fe964d4204e307e89bdb47da0fcd82927a4cb5..55971bf7943408894bc9bb93445250decb44a42e 100755
--- a/typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc
+++ b/typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc
@@ -359,16 +359,17 @@ class user_wapversion {
}
/**
- * Cleaning up the menu array returned from sys_page->getMenu(). Removing page types with doktype "5" (not in menu)
+ * Cleaning up the menu array returned from sys_page->getMenu().
+ * Removing pages having "not in menu" set.
*
* @param array Menu item array
- * @return array New menu item array with doktype-5 elements removed.
+ * @return array New menu item array with "not in menu" elements removed.
*/
function cleanMenuArray($menu) {
reset($menu);
$newMenu=array();
while(list(,$data)=each($menu)) {
- if ($data['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$data['nav_hide']) {
+ if (!$data['nav_hide']) {
$newMenu[]=$data;
}
}
diff --git a/typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php b/typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
index d09a0f0c60aebc64545827d562564a6119430d74..b99463aa50e6fa90b5ea7e40731d844789840327 100755
--- a/typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
+++ b/typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
@@ -276,14 +276,12 @@ class tx_indexedsearch extends tslib_pibase {
if ($this->conf['show.']['L1sections']) {
$firstLevelMenu = $this->getMenu($this->wholeSiteIdList);
foreach ($firstLevelMenu as $kk => $mR) {
- // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
- if ($mR['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$mR['nav_hide']) {
+ if (!$mR['nav_hide']) {
$this->optValues['sections']['rl1_'.$mR['uid']] = trim($this->pi_getLL('opt_RL1').' '.$mR['title']);
if ($this->conf['show.']['L2sections']) {
$secondLevelMenu = $this->getMenu($mR['uid']);
foreach ($secondLevelMenu as $kk2 => $mR2) {
- // @TODO: RFC #7370: doktype 2&5 are deprecated since TYPO3 4.2-beta1
- if ($mR2['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$mR2['nav_hide']) {
+ if (!$mR2['nav_hide']) {
$this->optValues['sections']['rl2_'.$mR2['uid']] = trim($this->pi_getLL('opt_RL2').' '.$mR2['title']);
} else unset($secondLevelMenu[$kk2]);
}
diff --git a/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc b/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
index f4910d90387be421164c54c9ed55d59702664cd8..bd6b160bf6527d8d9f86e828361809bfab474eab 100644
--- a/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
+++ b/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
@@ -367,7 +367,7 @@ class user_wapversion {
function cleanMenuArray($menu) {
$newMenu=array();
foreach ($menu as $data) {
- if ($data['doktype'] != t3lib_pageSelect::DOKTYPE_HIDE_IN_MENU && !$data['nav_hide']) {
+ if (!$data['nav_hide']) {
$newMenu[]=$data;
}
}
diff --git a/typo3/template.php b/typo3/template.php
index c3e0f25e2c9538d51135199f57e650ee2c66517e..c43e3f174606f99cd6e3dec50f2827dc29f6ef42 100644
--- a/typo3/template.php
+++ b/typo3/template.php
@@ -1498,9 +1498,6 @@ $str.=$this->docBodyTagBegin().
$this->JScodeArray['clickmenu'] = '
Clickmenu.clickURL = "'.$this->backPath.'alt_clickmenu.php";
Clickmenu.ajax = '.($this->isCMLayers() ? 'true' : 'false' ).';';
-
- // return array deprecated since 4.2
- return array('','','');
}
/**
@@ -1521,9 +1518,6 @@ $str.=$this->docBodyTagBegin().
DragDrop.backPath = "'.t3lib_div::shortMD5(''.'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']).'";
DragDrop.table = "'.$table.'";
';
-
- // return array deprecated since 4.2
- return array('','','');
}
/**