Skip to content

Commit

Permalink
Merge pull request #5 in FREEPBX/arimanager from bugfix/FREEI-890-fix…
Browse files Browse the repository at this point in the history
…-xss-bootstrap-datatable-issues to release/13.0

* commit 'b48d2605e2214f5137867b6cf4854f9ce56ca669':
  FREEI-890 Fix XSS Bootstrap Datatable Issues
  • Loading branch information
kguptasangoma committed Nov 25, 2019
2 parents 3713ad2 + b48d260 commit 199dea7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion views/grid.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<i class="fa fa-plus"></i> <span><?php echo _('Add User')?></span>
</a>
</div>
<table id="ariusergrid" data-url="<?php echo $dataurl?>" data-cache="false" data-toolbar="#toolbar-all" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped">
<table id="ariusergrid" data-escape="true" data-url="<?php echo $dataurl?>" data-cache="false" data-toolbar="#toolbar-all" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped">
<thead>
<tr>
<th data-field="name"><?php echo _("Username")?></th>
Expand Down
2 changes: 1 addition & 1 deletion views/rnav.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<i class="fa fa-plus"></i> <span><?php echo _('Add User')?></span>
</a>
</div>
<table id="ariusergrid-side" data-url="<?php echo $dataurl?>" data-cache="false" data-toolbar="#toolbar-all" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped">
<table id="ariusergrid-side" data-escape="true" data-url="<?php echo $dataurl?>" data-cache="false" data-toolbar="#toolbar-all" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped">
<thead>
<tr>
<th data-field="name"><?php echo _("Username")?></th>
Expand Down

0 comments on commit 199dea7

Please sign in to comment.