<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[4173] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php: Plugin Directory: Whitespace cleanup for `Jetpack_Search`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/4173">4173</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/4173","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-30 10:16:13 +0000 (Fri, 30 Sep 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Whitespace cleanup for `Jetpack_Search`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorylibssitesearchjetpacksearchphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorylibssitesearchjetpacksearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php 2016-09-29 18:51:44 UTC (rev 4172)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php 2016-09-30 10:16:13 UTC (rev 4173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * WARNING: This file is distributed verbatim in Jetpack.
</span><span class="cx" style="display: block; padding: 0 10px"> * There should be nothing WordPress.com specific in this file.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This is a preliminary version of Jetpack Search.
</span><span class="cx" style="display: block; padding: 0 10px"> * It is highly likely that 95% of the time the search will not be using the loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_wp_query_args['filters'][] = array( 'not' => array( 'terms' => array( 'slug' => $query->query['installed_plugins'] ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = get_locale();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $locale && $locale !== 'en' && $locale !== 'en_US' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $es_wp_query_args['query_fields'] = array( "title_{$locale}_ngram^4", 'title_en_ngram^0.5', "content_{$locale}_ngram^2", 'content_en_ngram^0.5', "excerpt_{$locale}_ngram", 'excerpt_en_ngram', 'author', 'tag', 'category', 'slug_ngram', 'contributors' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $es_query_args = $this->convert_wp_es_to_es_args( $es_wp_query_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //Only trust ES to give us IDs, not the content since it is a mirror
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $es_query_args['fields'] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $es_query_args['fields'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Total number of results for paging purposes
</span><span class="cx" style="display: block; padding: 0 10px"> $this->found_posts = $this->search_result['results']['total'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't select anything, posts are inflated by Jetpack_SearchResult_Posts_Iterator
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Don't select anything, posts are inflated by Jetpack_SearchResult_Posts_Iterator
</ins><span class="cx" style="display: block; padding: 0 10px"> // in The Loop, to allow for multi site search
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,27 +465,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function convert_wp_es_to_es_args( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => get_current_blog_id(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'query' => null, // Search phrase
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_fields' => array( 'title_en^2', 'content_en', 'author', 'tag', 'category', 'slug_ngram', 'contributors' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => null, // string or an array
</span><span class="cx" style="display: block; padding: 0 10px"> 'terms' => array(), // ex: array( 'taxonomy-1' => array( 'slug' ), 'taxonomy-2' => array( 'slug-a', 'slug-b' ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'author' => null, // id or an array of ids
</span><span class="cx" style="display: block; padding: 0 10px"> 'author_name' => array(), // string or an array
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'date_range' => null, // array( 'field' => 'date', 'gt' => 'YYYY-MM-dd', 'lte' => 'YYYY-MM-dd' ); date formats: 'YYYY-MM-dd' or 'YYYY-MM-dd HH:MM:SS'
</span><span class="cx" style="display: block; padding: 0 10px"> 'tested_range' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'filters' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => null, // Defaults to 'relevance' if query is set, otherwise 'date'. Pass an array for multiple orders.
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 10,
</span><span class="cx" style="display: block; padding: 0 10px"> 'offset' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => null,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Facets. Examples:
</span><span class="cx" style="display: block; padding: 0 10px"> * array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,36 +495,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> 'facets' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $raw_args = $args; // Keep a copy
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $es_query_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => absint( $args['blog_id'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'size' => absint( $args['posts_per_page'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //TODO: limit size to 15
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // ES "from" arg (offset)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $args['offset'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $es_query_args['from'] = absint( $args['offset'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $args['paged'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $es_query_args['from'] = max( 0, ( absint( $args['paged'] ) - 1 ) * $es_query_args['size'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !is_array( $args['author_name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['author_name'] = array( $args['author_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // ES stores usernames, not IDs, so transform
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['author'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_array( $args['author'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $args['author'] = array( $args['author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args['author'] as $author ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'id', $author );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $user && ! empty( $user->user_login ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['author_name'][] = $user->user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,17 +537,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // but they are cached as individual filters, rather than all combined together.
</span><span class="cx" style="display: block; padding: 0 10px"> // May get performance boost by also caching the top level boolean filter too.
</span><span class="cx" style="display: block; padding: 0 10px"> $filters = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $args['post_type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !is_array( $args['post_type'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $args['post_type'] = array( $args['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $filters[] = array( 'terms' => array( 'post_type' => $args['post_type'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $args['author_name'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filters[] = array( 'terms' => array( 'author_login' => $args['author_name'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $args['date_range'] ) && isset( $args['date_range']['field'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = $args['date_range']['field'];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $args['date_range']['field'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,7 +563,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $args['filters'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filters = array_merge( $filters, $args['filters'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $args['terms'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args['terms'] as $tax => $terms ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = (array) $terms;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: boost title, tag, and category matches
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $args['query'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $analyzer = Jetpack_Search::get_analyzer_name( $this->blog_lang );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'bool' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'must' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'multi_match' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['orderby'] = array( 'date' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Validate the "order" field
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( strtolower( $args['order'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'asc':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['order'] = 'desc';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $es_query_args['sort'] = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $args['orderby'] as $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Translate orderby from WP field to ES field
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,7 +663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $es_query_args['sort'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $es_query_args['sort'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $filters ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $es_query_args['filter'] = array( 'and' => $filters );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $date_decay = 0.7;
</span><span class="cx" style="display: block; padding: 0 10px"> $date_origin = date( 'Y-m-d' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filtered' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'function_score' => array(
</span></span></pre>
</div>
</div>
</body>
</html>