From: skodak Date: Sat, 29 Dec 2007 16:49:26 +0000 (+0000) Subject: MDL-12756 print save button in admin search only when there are settings to save... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8bbfc1e321c954b6f63a4f7072271c8e1c9230ff;p=moodle.git MDL-12756 print save button in admin search only when there are settings to save; merged from MOODLE_19_STABLE --- diff --git a/admin/search.php b/admin/search.php index c07f86241a..4fcde9546a 100644 --- a/admin/search.php +++ b/admin/search.php @@ -51,7 +51,6 @@ echo '
'; echo '
'; if ($resultshtml != '') { echo $resultshtml; - echo '
'; } else { echo get_string('noresults','admin'); } diff --git a/lib/adminlib.php b/lib/adminlib.php index dea854e25a..e39627d0b9 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -4177,6 +4177,7 @@ function admin_search_settings_html($query) { $adminroot =& admin_get_root(); $findings = $adminroot->search($query); $return = ''; + $savebutton = false; foreach ($findings as $found) { $page = $found->page; @@ -4193,6 +4194,7 @@ function admin_search_settings_html($query) { continue; } if (!empty($settings)) { + $savebutton = true; $return .= '
'."\n"; foreach ($settings as $setting) { $return .= '
'."\n"; @@ -4211,6 +4213,10 @@ function admin_search_settings_html($query) { } } + if ($savebutton) { + $return .= '
'; + } + return $return; }