Merge master
This commit is contained in:
commit
1b69d6dcc8
46 changed files with 524 additions and 412 deletions
|
|
@ -124,7 +124,7 @@ endif;?>
|
|||
}
|
||||
?>
|
||||
<li class="<?php echo $style?>">
|
||||
<a class="nav-link" href="<?php echo $url?>" title="<?php echo _($row['me_description'])?>" <?php echo $js?> ><?php echo gettext($row['me_menu'])?></a>
|
||||
<a class="nav-link" href="<?php echo $url?>" title="<?php echo _($row['me_description']??''); ?>" <?php echo $js?> ><?php echo gettext($row['me_menu'])?></a>
|
||||
</li>
|
||||
<?php
|
||||
endforeach;
|
||||
|
|
@ -168,7 +168,7 @@ endif;?>
|
|||
}
|
||||
?>
|
||||
<li class="<?php echo $style?>">
|
||||
<a class="nav-link" href="<?php echo $url?>" title="<?php echo _($row['me_description'])?>" <?php echo $js?> ><?php echo gettext($row['me_menu'])?></a>
|
||||
<a class="nav-link" href="<?php echo $url?>" title="<?php echo _($row['me_description']??"")?>" <?php echo $js?> ><?php echo gettext($row['me_menu'])?></a>
|
||||
</li>
|
||||
<?php
|
||||
endforeach;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue