Merge branch 'branch_2.3' of ssh://marigold.shishnet.org/git/shimmie2 into branch_2.3
This commit is contained in:
commit
c6636265cb
@ -125,6 +125,11 @@ class Ratings implements Extension {
|
||||
$set = join(', ', $arr);
|
||||
$event->add_querylet(new Querylet("rating IN ($set)"));
|
||||
}
|
||||
if(preg_match("/^rating=(safe|questionable|explicit|unknown)$/", strtolower($event->term), $matches)) {
|
||||
$text = $matches[1];
|
||||
$char = $text[0];
|
||||
$event->add_querylet(new Querylet("rating = ?", array($char)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -48,9 +48,13 @@ class ViewImageTheme extends Themelet {
|
||||
protected function build_navigation(Image $image) {
|
||||
$h_pin = $this->build_pin($image);
|
||||
$h_search = "
|
||||
<script><!--
|
||||
$(document).ready(function() {
|
||||
$(\"#search_input\").DefaultValue(\"Search\");
|
||||
});
|
||||
//--></script>
|
||||
<p><form action='".make_link()."' method='GET'>
|
||||
<input id='search_input' name='search' type='text'
|
||||
value='Search' autocomplete='off'>
|
||||
<input id='search_input' name='search' type='text'>
|
||||
<input type='submit' value='Find' style='display: none;'>
|
||||
</form>
|
||||
<div id='search_completions'></div>";
|
||||
|
Loading…
x
Reference in New Issue
Block a user