*** empty log message ***
authorKasper Skårhøj <kasper@typo3.org>
Mon, 24 Jan 2005 00:29:18 +0000 (00:29 +0000)
committerKasper Skårhøj <kasper@typo3.org>
Mon, 24 Jan 2005 00:29:18 +0000 (00:29 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@540 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_softrefproc.php
typo3/db_list.php

index ccaf443..6cd9bc0 100755 (executable)
@@ -106,7 +106,6 @@ require_once(PATH_t3lib.'class.t3lib_parsehtml.php');
  * - 'typolink_tag' : As typolink, but searching for <link> tag to encapsulate it.
  * - 'TSconfig' processing (filerefs? Domains? what do we know...)
  * - 'TStemplate' : freetext references to "fileadmin/" files.
- * - 'ext_fileref' : Relative file reference, prefixed "EXT:[extkey]/" - for finding extension dependencies
  * - 'email' : Email highlight
  * - 'url' : URL highlights (with a scheme)
  *
@@ -321,9 +320,9 @@ class t3lib_softrefproc {
                $elements = array();
                foreach($linkTags as $k => $foundValue) {
                        if ($k%2)       {
-                               $typolinkValue = eregi_replace('<link[[:space:]]+','',substr($foundValue,0,-1));
+                               $typolinkValue = eregi_replace('<LINK[[:space:]]+','',substr($foundValue,0,-1));
                                $tLP = $this->getTypoLinkParts($typolinkValue);
-                               $linkTags[$k] = '<link '.$this->setTypoLinkPartsElement($tLP, $elements, $typolinkValue, $k).'>';
+                               $linkTags[$k] = '<LINK '.$this->setTypoLinkPartsElement($tLP, $elements, $typolinkValue, $k).'>';
                        }
                }
 
index 8871097..6e19e63 100755 (executable)
@@ -231,7 +231,7 @@ class SC_db_list {
                if ($this->cmd=='setCB') {
                                // CBH is all the fields selected for the clipboard, CBC is the checkbox fields which were checked. By merging we get a full array of checked/unchecked elements
                                // This is set to the 'el' array of the CB after being parsed so only the table in question is registered.
-                       $CB['el'] = $dblist->clipObj->cleanUpCBC(array_merge(t3lib_div::_POST('CBH'),t3lib_div::_POST('CBC')),$this->cmd_table);
+                       $CB['el'] = $dblist->clipObj->cleanUpCBC(array_merge((array)t3lib_div::_POST('CBH'),(array)t3lib_div::_POST('CBC')),$this->cmd_table);
                }
                if (!$this->MOD_SETTINGS['clipBoard'])  $CB['setP']='normal';   // If the clipboard is NOT shown, set the pad to 'normal'.
                $dblist->clipObj->setCmd($CB);          // Execute commands.