Renamed `user_ip_address_searchengine` to `ip_address_search_engine`

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 8f1f53ca15b63609f2680d0ca11d8f67c6a5ed01..20d905b17bfec268eb81cc0313d7a1ba7c6e6722 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1345,7 +1345,7 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
                                <optiontype>integer</optiontype>
                                <hidden>1</hidden>
                        </option>
-                       <option name="user_ip_address_searchengine">
+                       <option name="ip_address_search_engine">
                                <categoryname>user.list.online</categoryname>
                                <optiontype>text</optiontype>
                        </option>

diff --git a/constants.php b/constants.php
index 3d367c369011e9e8ac4321480b6ee9e47354ce34..08aac499a5d412923525b788084baeb0e9648f2f 100644 (file)
--- a/constants.php
+++ b/constants.php
@@ -72,7 +72,7 @@ define('HTTP_ENABLE_GZIP', 1);
 define('PACKAGE_SERVER_AUTH_CODE', '');
 define('PROXY_SERVER_HTTP', '');
 define('SESSION_TIMEOUT', 1800);
-define('USER_IP_ADDRESS_SEARCHENGINE', '');
+define('IP_ADDRESS_SEARCH_ENGINE', '');
 define('USER_ONLINE_TIMEOUT', 900);
 define('SESSION_VALIDATE_IP_ADDRESS', 0);
 define('SESSION_VALIDATE_USER_AGENT', 1);

diff --git a/wcfsetup/install/files/lib/system/template/plugin/IpSearchModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/IpSearchModifierTemplatePlugin.class.php
index 5b27eb8594425b22751d33965d8715fc035f3302..891a74bce3418e46c73f5e3a97956048036795e0 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/IpSearchModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/IpSearchModifierTemplatePlugin.class.php
@@ -30,9 +30,9 @@ class IpSearchModifierTemplatePlugin implements IModifierTemplatePlugin {
         * @inheritDoc
         */
        public function execute($tagArgs, TemplateEngine $tplObj) {
-               $domain = Url::parse(USER_IP_ADDRESS_SEARCHENGINE ?: self::SEARCH_ENGINE_URL_DEFAULT)['host'];
+               $domain = Url::parse(IP_ADDRESS_SEARCH_ENGINE ?: self::SEARCH_ENGINE_URL_DEFAULT)['host'];
                $ipAddress = StringUtil::trim(MessageUtil::stripCrap($tagArgs[0]));
-               $url = sprintf(USER_IP_ADDRESS_SEARCHENGINE ?: self::SEARCH_ENGINE_URL_DEFAULT, $ipAddress);
+               $url = sprintf(IP_ADDRESS_SEARCH_ENGINE ?: self::SEARCH_ENGINE_URL_DEFAULT, $ipAddress);
                $title = WCF::getLanguage()->getDynamicVariable('wcf.user.ipAddress.searchEngine', ['host' => $domain, 'ipAddress' => $ipAddress]);
                
                return '<a href="' . $url . '"' . (EXTERNAL_LINK_REL_NOFOLLOW ? ' rel="nofollow"' : '') .(EXTERNAL_LINK_TARGET_BLANK ? ' target="_blank"' : '') . ' title="' . $title . '">' . $ipAddress . '</a>';