summaryrefslogtreecommitdiffstats
path: root/template/standard/html/search
diff options
context:
space:
mode:
authorThomas Lange <code@nerdmind.de>2017-08-11 03:24:07 +0200
committerThomas Lange <code@nerdmind.de>2017-08-11 03:24:07 +0200
commita9684792106e4de3aa622d33a0ed7780cbd67ad0 (patch)
tree4051a0a99e2b4388bd919d3c90444d6b612a0400 /template/standard/html/search
parent6c550895ef0f27bf84b8a5d7917eeee3e3122f67 (diff)
downloadblog-d8af3c95848bf56eb82cda07463406a98fd6de30.tar.gz
blog-d8af3c95848bf56eb82cda07463406a98fd6de30.tar.xz
blog-d8af3c95848bf56eb82cda07463406a98fd6de30.zip
Several changes have been made in this commit, which together with the previous commits result in version 2.3:v2.3
+ Optimization: Originally, the core and template languages were completely separated in the logic of the Language class and you had to use "$Language->text()" to get a core language string and "$Language->template()" to get a template language string. Since this commit, the core and template language strings are still located in different files, but you now have to use "$Language->text()" for core and template language strings both. Thus, you can now even overwrite a core language string from the language file of a template if the core language string does not satisfy you. + Deprecated: The method "$Language->template()" was marked as deprecated and will be removed in further versions (currently, it's just an alias for "$Language->text()"). Template upgrade to version 2.3 (only for customized templates): SEARCH: $Language->template REPLACE: $Language->text
Diffstat (limited to 'template/standard/html/search')
-rw-r--r--template/standard/html/search/main.php6
-rw-r--r--template/standard/html/search/result.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/template/standard/html/search/main.php b/template/standard/html/search/main.php
index 39d251d..61bd6a5 100644
--- a/template/standard/html/search/main.php
+++ b/template/standard/html/search/main.php
@@ -1,12 +1,12 @@
-<h1><i class="fa fa-search"></i><?=$Language->template('search_base_heading_text')?></h1>
-<p><?=$Language->template('search_base_heading_desc')?></p>
+<h1><i class="fa fa-search"></i><?=$Language->text('search_base_heading_text')?></h1>
+<p><?=$Language->text('search_base_heading_desc')?></p>
<?php if($SEARCH['INFO']): ?>
<div class="red"><?=$SEARCH['INFO']?></div>
<?php endif; ?>
<form action="" method="GET">
- <input autofocus type="search" name="q" placeholder="<?=$Language->template('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" />
+ <input autofocus type="search" name="q" placeholder="<?=$Language->text('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" />
<select name="d">
<option value=""><?=$Language->text('date_d')?></option>
diff --git a/template/standard/html/search/result.php b/template/standard/html/search/result.php
index c07dec9..1558c3c 100644
--- a/template/standard/html/search/result.php
+++ b/template/standard/html/search/result.php
@@ -1,8 +1,8 @@
-<h1><?=$Language->template('search_result_heading_text', escapeHTML($SEARCH['TEXT']))?></h1>
-<p><?=$Language->template('search_result_heading_desc')?></p>
+<h1><?=$Language->text('search_result_heading_text', escapeHTML($SEARCH['TEXT']))?></h1>
+<p><?=$Language->text('search_result_heading_desc')?></p>
<form action="" method="GET">
- <input autofocus type="search" name="q" placeholder="<?=$Language->template('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" />
+ <input autofocus type="search" name="q" placeholder="<?=$Language->text('search_form_placeholder')?>" value="<?=escapeHTML($SEARCH['TEXT'])?>" />
<select name="d">
<option value=""><?=$Language->text('date_d')?></option>