[CLEANUP] Properly name "typoLink" and "typoLink_URL" 44/43344/2
authorMathias Brodala <mbrodala@pagemachine.de>
Tue, 15 Sep 2015 15:23:55 +0000 (17:23 +0200)
committerNicole Cordes <typo3@cordes.co>
Tue, 15 Sep 2015 17:08:27 +0000 (19:08 +0200)
Resolves: #69839
Releases: master
Change-Id: Icce81f54c96cee5968bf31855e40b84557d3d6ad
Reviewed-on: http://review.typo3.org/43344
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Stephan GroƟberndt <stephan@grossberndt.de>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
typo3/sysext/core/Classes/Html/RteHtmlParser.php
typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php [changed mode: 0755->0644]
typo3/sysext/t3editor/Resources/Private/tsref.xml

index 1132992..aeb66e1 100644 (file)
@@ -669,7 +669,7 @@ class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
                                $tagCode = GeneralUtility::makeInstance(TypoLinkCodecService::class)->decode($typolink);
 
                                $link_param = $tagCode['url'];
-                               // Parsing the typolink data. This parsing is roughly done like in \TYPO3\CMS\Frontend\ContentObject->typolink()
+                               // Parsing the typolink data. This parsing is roughly done like in \TYPO3\CMS\Frontend\ContentObject->typoLink()
                                // Parse URL:
                                $pU = parse_url($link_param);
                                if (strstr($link_param, '@') && (!$pU['scheme'] || $pU['scheme'] == 'mailto')) {
index 637fce3..ebd67e3 100644 (file)
@@ -716,7 +716,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                                        }
                                } elseif ($this->logintype == '' && $redirMethod == 'login' && $this->conf['redirectPageLogin']) {
                                        // If login and page not accessible
-                                       $this->cObj->typolink('', array(
+                                       $this->cObj->typoLink('', array(
                                                'parameter' => $this->conf['redirectPageLogin'],
                                                'linkAccessRestrictedPages' => TRUE
                                        ));
@@ -846,9 +846,9 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                        $this->conf['linkConfig.']['additionalParams'] = $additionalParams;
                }
                if ($returnUrl) {
-                       return htmlspecialchars($this->cObj->typolink_url($this->conf['linkConfig.']));
+                       return htmlspecialchars($this->cObj->typoLink_URL($this->conf['linkConfig.']));
                } else {
-                       return $this->cObj->typolink($label, $this->conf['linkConfig.']);
+                       return $this->cObj->typoLink($label, $this->conf['linkConfig.']);
                }
        }
 
old mode 100755 (executable)
new mode 100644 (file)
index 391511b..fab25e0
@@ -1708,7 +1708,7 @@ class ContentObjectRenderer {
                if (!$enable) {
                        return $string;
                }
-               $content = $this->typolink($string, $conf['typolink.']);
+               $content = $this->typoLink($string, $conf['typolink.']);
                if (isset($conf['file.'])) {
                        $imageFile = $this->stdWrap($imageFile, $conf['file.']);
                }
@@ -3356,7 +3356,7 @@ class ContentObjectRenderer {
         * @return string The processed input value
         */
        public function stdWrap_typolink($content = '', $conf = array()) {
-               return $this->typolink($content, $conf['typolink.']);
+               return $this->typoLink($content, $conf['typolink.']);
        }
 
        /**
@@ -6596,7 +6596,7 @@ class ContentObjectRenderer {
         * @see typoLink()
         */
        public function typoLink_URL($conf) {
-               $this->typolink('|', $conf);
+               $this->typoLink('|', $conf);
                return $this->lastTypoLinkUrl;
        }
 
@@ -6628,7 +6628,7 @@ class ContentObjectRenderer {
                } else {
                        $conf['additionalParams'] .= $urlParameters;
                }
-               $out = $this->typolink($label, $conf);
+               $out = $this->typoLink($label, $conf);
                return $out;
        }
 
@@ -6678,7 +6678,7 @@ class ContentObjectRenderer {
         */
        public function typolinkWrap($conf) {
                $k = md5(microtime());
-               return explode($k, $this->typolink($k, $conf));
+               return explode($k, $this->typoLink($k, $conf));
        }
 
        /**
index 809c3d8..f5abe73 100644 (file)
@@ -8001,7 +8001,7 @@ NOTE: This is only active for internal links!]]></description>
 ]]></default>
                </property>
                <property name="parameter" type="stdWrap">
-                       <description><![CDATA[This is the data, that ->typolink uses to create the link. The value is trimmed and if it's empty, ->typolink returns the input value untouched.
+                       <description><![CDATA[This is the data, that ->typoLink uses to create the link. The value is trimmed and if it's empty, ->typoLink returns the input value untouched.
 
 NOTE: If used from parseFunc, this value should be imported by:
 typolink.parameter.data = parameters : allParams