Skip to content

Commit

Permalink
Merge branch 'wip-MDL-35885-stable23' of git://github.com/phalacee/mo…
Browse files Browse the repository at this point in the history
…odle into MOODLE_23_STABLE
  • Loading branch information
Sam Hemelryk committed Jan 14, 2013
2 parents 7fa6857 + 6df2ead commit 3434298
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions mod/wiki/lang/en/wiki.php
Expand Up @@ -197,6 +197,7 @@
$string['savingerror'] = 'Saving error'; $string['savingerror'] = 'Saving error';
$string['searchcontent'] = 'Search in page content'; $string['searchcontent'] = 'Search in page content';
$string['searchresult'] = 'Search results:'; $string['searchresult'] = 'Search results:';
$string['searchterms'] = 'Search terms';
$string['searchwikis'] = 'Search wikis'; $string['searchwikis'] = 'Search wikis';
$string['special'] = 'Special'; $string['special'] = 'Special';
$string['tableofcontents'] = 'Table of contents'; $string['tableofcontents'] = 'Table of contents';
Expand Down
3 changes: 2 additions & 1 deletion mod/wiki/lib.php
Expand Up @@ -474,7 +474,8 @@ function wiki_search_form($cm, $search = '') {
$output = '<div class="wikisearch">'; $output = '<div class="wikisearch">';
$output .= '<form method="post" action="' . $CFG->wwwroot . '/mod/wiki/search.php" style="display:inline">'; $output .= '<form method="post" action="' . $CFG->wwwroot . '/mod/wiki/search.php" style="display:inline">';
$output .= '<fieldset class="invisiblefieldset">'; $output .= '<fieldset class="invisiblefieldset">';
$output .= '<label class="accesshide" for="searchwiki">' . get_string("searchwikis", "wiki") . '</label>'; $output .= '<legend class="accesshide">'. get_string('searchwikis', 'wiki') .'</legend>';
$output .= '<label class="accesshide" for="searchwiki">' . get_string("searchterms", "wiki") . '</label>';
$output .= '<input id="searchwiki" name="searchstring" type="text" size="18" value="' . s($search, true) . '" alt="search" />'; $output .= '<input id="searchwiki" name="searchstring" type="text" size="18" value="' . s($search, true) . '" alt="search" />';
$output .= '<input name="courseid" type="hidden" value="' . $cm->course . '" />'; $output .= '<input name="courseid" type="hidden" value="' . $cm->course . '" />';
$output .= '<input name="cmid" type="hidden" value="' . $cm->id . '" />'; $output .= '<input name="cmid" type="hidden" value="' . $cm->id . '" />';
Expand Down

0 comments on commit 3434298

Please sign in to comment.