Commit 5179a7c4 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Correction erreur lors de la résolution du conflit.

parent 0cd7abdd
...@@ -70,12 +70,11 @@ class UserCurrent extends UserAbstract ...@@ -70,12 +70,11 @@ class UserCurrent extends UserAbstract
href="#">$status</a> href="#">$status</a>
EOS; EOS;
$out .= PHP_EOL; $out .= PHP_EOL;
$out .= <<<EOS
<script type="text/javascript"> $js = <<<EOS
$(function() { $(function() {
$("#$id").popover({ html: true, container: '#navbar' }); $("#$id").popover({ html: true, container: '#navbar' });
}); });
</script>
EOS; EOS;
$this->getView()->plugin('inlineScript')->offsetSetScript(1000, $js); $this->getView()->plugin('inlineScript')->offsetSetScript(1000, $js);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment