Commit r2356: https://sourceforge.net/p/mrbs/code/2356/
------------------------------------------------------------------------
r2356 | cimorrison | 2012-07-25 16:50:45 +0100 (Wed, 25 Jul 2012) | 1 line
Changed paths:
M /mrbs/trunk/web/js/edit_users.js.php
M /mrbs/trunk/web/js/report.js.php
M /mrbs/trunk/web/js/search.js.php
Fixed some potential bugs
------------------------------------------------------------------------
Index: mrbs/trunk/web/js/search.js.php
===================================================================
--- mrbs/trunk/web/js/search.js.php (revision 2355)
+++ mrbs/trunk/web/js/search.js.php (revision 2356)
@@ -50,7 +50,7 @@
<?php
// Use an Ajax source - gives much better performance for large tables
list( ,$query_string) = explode('?', $HTTP_REFERER, 2);
- $ajax_url = "search.php?" . $query_string . "&ajax=1";
+ $ajax_url = "search.php?" . (empty($query_string) ? '' : "$query_string&")
. "ajax=1";
?>
tableOptions.sAjaxSource = "<?php echo $ajax_url ?>";
tableOptions.aoColumnDefs = [{"sType": "title-numeric", "aTargets": [2]}];
Index: mrbs/trunk/web/js/edit_users.js.php
===================================================================
--- mrbs/trunk/web/js/edit_users.js.php (revision 2355)
+++ mrbs/trunk/web/js/edit_users.js.php (revision 2356)
@@ -27,7 +27,7 @@
{
list( ,$query_string) = explode('?', $HTTP_REFERER, 2);
}
- $ajax_url = "edit_users.php?" . (empty($query_string) ? '' : '&') .
"ajax=1";
+ $ajax_url = "edit_users.php?" . (empty($query_string) ? '' :
"$query_string&") . "ajax=1";
?>
tableOptions.sAjaxSource = "<?php echo $ajax_url ?>";
<?php
Index: mrbs/trunk/web/js/report.js.php
===================================================================
--- mrbs/trunk/web/js/report.js.php (revision 2355)
+++ mrbs/trunk/web/js/report.js.php (revision 2356)
@@ -159,7 +159,7 @@
if (function_exists('json_encode'))
{
list( ,$query_string) = explode('?', $HTTP_REFERER, 2);
- $ajax_url = "report.php?" . $query_string . "&ajax=1&phase=2";
+ $ajax_url = "report.php?" . (empty($query_string) ? '' : "$query_string&")
. "ajax=1&phase=2";
?>
tableOptions.sAjaxSource = "<?php echo $ajax_url ?>";
<?php
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
