Skip to content

Commit 94b7918

Browse files
committed
mark addCssIe and addJsIe and <if> tag as deprecated and disable them
1 parent 310cd56 commit 94b7918

File tree

1 file changed

+4
-17
lines changed
  • app/code/core/Mage/Page/Block/Html

1 file changed

+4
-17
lines changed

app/code/core/Mage/Page/Block/Html/Head.php

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ public function addJs($name, $params = "")
8080
* @param string $name
8181
* @param string $params
8282
* @return $this
83+
* @deprecated
8384
*/
8485
public function addCssIe($name, $params = "")
8586
{
86-
$this->addItem('skin_css', $name, $params, 'IE');
8787
return $this;
8888
}
8989

@@ -93,10 +93,10 @@ public function addCssIe($name, $params = "")
9393
* @param string $name
9494
* @param string $params
9595
* @return $this
96+
* @deprecated
9697
*/
9798
public function addJsIe($name, $params = "")
9899
{
99-
$this->addItem('js', $name, $params, 'IE');
100100
return $this;
101101
}
102102

@@ -196,12 +196,8 @@ public function getCssJsHtml()
196196
continue;
197197
}
198198
if (!empty($if)) {
199-
// open !IE conditional using raw value
200-
if (strpos($if, "><!-->") !== false) {
201-
$html .= $if . "\n";
202-
} else {
203-
$html .= '<!--[if '.$if.']>' . "\n";
204-
}
199+
// @deprecated
200+
continue;
205201
}
206202

207203
// static and skin css
@@ -224,15 +220,6 @@ public function getCssJsHtml()
224220
if (!empty($items['other'])) {
225221
$html .= $this->_prepareOtherHtmlHeadElements($items['other']) . "\n";
226222
}
227-
228-
if (!empty($if)) {
229-
// close !IE conditional comments correctly
230-
if (strpos($if, "><!-->") !== false) {
231-
$html .= '<!--<![endif]-->' . "\n";
232-
} else {
233-
$html .= '<![endif]-->' . "\n";
234-
}
235-
}
236223
}
237224
return $html;
238225
}

0 commit comments

Comments
 (0)