From c6bf8d8ab9463722da4e1e0323c3383e08b8924e Mon Sep 17 00:00:00 2001 From: Sem Date: Thu, 14 Feb 2013 14:02:41 +0100 Subject: Using correct language in html tag and putting a placeholder in the search box. --- views/default/page/admin.php | 4 ++-- views/default/page/default.php | 4 ++-- views/default/page/elements/head.php | 8 +++---- views/default/page/walled_garden.php | 4 ++-- views/default/search/search_box.php | 41 ++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 views/default/search/search_box.php diff --git a/views/default/page/admin.php b/views/default/page/admin.php index 7d0449096..a6d6bf6e1 100644 --- a/views/default/page/admin.php +++ b/views/default/page/admin.php @@ -32,7 +32,7 @@ header("Content-type: text/html; charset=UTF-8"); ?> - + @@ -63,4 +63,4 @@ header("Content-type: text/html; charset=UTF-8"); - \ No newline at end of file + diff --git a/views/default/page/default.php b/views/default/page/default.php index f75fa1908..a0e6d4037 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -35,7 +35,7 @@ header("Content-type: text/html; charset=UTF-8"); ?> - + @@ -71,4 +71,4 @@ header("Content-type: text/html; charset=UTF-8"); - \ No newline at end of file + diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php index b1556b547..e7951c4ff 100644 --- a/views/default/page/elements/head.php +++ b/views/default/page/elements/head.php @@ -14,7 +14,7 @@ if (empty($vars['title'])) { global $autofeed; if (isset($autofeed) && $autofeed == true) { - $url = full_url(); + $url = current_page_url(); if (substr_count($url,'?')) { $url .= "&view=rss"; } else { @@ -33,12 +33,10 @@ END; $js = elgg_get_loaded_js('head'); $css = elgg_get_loaded_css(); -$version = get_version(); $release = get_version(true); ?> - - + <?php echo $title; ?> @@ -76,4 +74,4 @@ $metatags = elgg_view('metatags', $vars); if ($metatags) { elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8); echo $metatags; -} \ No newline at end of file +} diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php index e1d57dac8..77c901d8c 100644 --- a/views/default/page/walled_garden.php +++ b/views/default/page/walled_garden.php @@ -9,7 +9,7 @@ header("Content-type: text/html; charset=UTF-8"); ?> - + @@ -24,4 +24,4 @@ header("Content-type: text/html; charset=UTF-8"); - \ No newline at end of file + diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php new file mode 100644 index 000000000..c1ea40705 --- /dev/null +++ b/views/default/search/search_box.php @@ -0,0 +1,41 @@ +,&, quotes and characters above 127 +if (function_exists('mb_convert_encoding')) { + $display_query = mb_convert_encoding($value, 'HTML-ENTITIES', 'UTF-8'); +} else { + // if no mbstring extension, we just strip characters + $display_query = preg_replace("/[^\x01-\x7F]/", "", $value); +} +$display_query = htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false); + +?> + +
+
+ + + +
+
-- cgit v1.2.3