Merge remote-tracking branch 'kevin/issue/org-pages-link' into features_prs/develop-next

include/staff/templates/users.tmpl.php

@@ -36,7 +36,10 @@ $pageNav=new Pagenate($total,$page,PAGE_LIMIT);
 $qstr = '&'. Http::build_query($qs);
 $qs += array('sort' => $_REQUEST['sort'], 'order' => $_REQUEST['order']);
 
-$pageNav->setURL('users.php', $qs);
+if (strpos($_SERVER['REQUEST_URI'], 'orgs.php') !== false)
+    $pageNav->setURL('orgs.php?id='.$org->getId().'&', $qs);
+else
+    $pageNav->setURL('users.php', $qs);
 //Ok..lets roll...create the actual query
 $qstr .= '&order='.($order=='DESC' ? 'ASC' : 'DESC');