summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-01-11 12:20:12 +0100
committerAndrey Andreev <narf@devilix.net>2016-01-11 12:20:12 +0100
commit8f1047ff6bc961159a7103e7be02e6cc459d925e (patch)
tree1a346869a5f3500f1423dcf7b58ae6c82da1a8ca /system
parent85ce9ab3f569450396a6f0688b2f047f58527598 (diff)
Polish changes from PR #4269
Diffstat (limited to 'system')
-rw-r--r--system/helpers/html_helper.php28
1 files changed, 21 insertions, 7 deletions
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 5cc994ff1..becd9a00c 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -359,17 +359,31 @@ if ( ! function_exists('meta'))
// Turn single array into multidimensional
$name = array($name);
}
- $allowed_type = array('charset', 'http-equiv', 'name', 'property');
+
+ $allowed_types = array('charset', 'http-equiv', 'name', 'property');
$str = '';
foreach ($name as $meta)
{
- $meta['type'] = isset($meta['type']) ? (($meta['type'] === 'equiv') ? 'http-equiv' : $meta['type']) : ''; // backward compatibility
- $type = in_array($meta['type'], $allowed_type) ? $meta['type'] : 'name';
- $name = isset($meta['name']) ? $meta['name'] : '';
- $content = isset($meta['content']) ? $meta['content'] : '';
- $newline = isset($meta['newline']) ? $meta['newline'] : "\n";
+ // This is to preserve BC with pre-3.1 versions where only
+ // 'http-equiv' (default) and 'name' were supported.
+ if (isset($meta['type']))
+ {
+ if ($meta['type'] === 'equiv')
+ {
+ $meta['type'] === 'http-equiv';
+ }
+ elseif ( ! in_array($meta['type'], $allowed_types, TRUE))
+ {
+ $meta['type'] = 'name';
+ }
+ }
+
+ $type = isset($meta['type']) ? $meta['type'] : 'name';
+ $name = isset($meta['name']) ? $meta['name'] : '';
+ $content = isset($meta['content']) ? $meta['content'] : '';
+ $newline = isset($meta['newline']) ? $meta['newline'] : "\n";
- $str .= '<meta '.$type.'="'.$name.(($type === 'charset')?'':'" content="'.$content).'" />'.$newline;
+ $str .= '<meta '.$type.'="'.$name.($type === 'charset' ? '' : '" content="'.$content).'" />'.$newline;
}
return $str;