Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop

1.8.18

Conflicts:
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js

3 files changed, 4 insertions, 4 deletions

diff --git a/mod/logbrowser/views/default/forms/logbrowser/refine.php b/mod/logbrowser/views/default/forms/logbrowser/refine.php
index ebf7f10ed..3d081c9c2 100644
--- a/mod/logbrowser/views/default/forms/logbrowser/refine.php
+++ b/mod/logbrowser/views/default/forms/logbrowser/refine.php
@@ -9,12 +9,12 @@
  * @uses $vars['timeupper']
  */
 
-if (isset($vars['timelower'])) {
+if (isset($vars['timelower']) && $vars['timelower']) {
 	$lowerval = date('r', $vars['timelower']);
 } else {
 	$lowerval = "";
 }
-if (isset($vars['timeupper'])) {
+if (isset($vars['timeupper']) && $vars['timeupper']) {
 	$upperval = date('r', $vars['timeupper']);
 } else {
 	$upperval = "";
diff --git a/mod/logbrowser/views/default/logbrowser/refine.php b/mod/logbrowser/views/default/logbrowser/refine.php
index 86460c79e..b40f23fa3 100644
--- a/mod/logbrowser/views/default/logbrowser/refine.php
+++ b/mod/logbrowser/views/default/logbrowser/refine.php
@@ -19,7 +19,7 @@ $toggle_link = elgg_view('output/url', array(
 ));
 
 $form_class = 'elgg-module elgg-module-inline';
-if (!isset($vars['user_guid'])) {
+if (!isset($vars['user_guid']) && !isset($vars['username'])) {
 	$form_class .= ' hidden';
 }
 
diff --git a/mod/logbrowser/views/default/logbrowser/table.php b/mod/logbrowser/views/default/logbrowser/table.php
index 1223c1456..b08a0c428 100644
--- a/mod/logbrowser/views/default/logbrowser/table.php
+++ b/mod/logbrowser/views/default/logbrowser/table.php
@@ -35,7 +35,7 @@ $log_entries = $vars['log_entries'];
 				'is_trusted' => true,
 			));
 			$user_guid_link = elgg_view('output/url', array(
-				'href' => "admin/overview/logbrowser?user_guid=$user->guid",
+				'href' => "admin/administer_utilities/logbrowser?user_guid={$user->guid}",
 				'text' => $user->getGUID(),
 				'is_trusted' => true,
 			));