Bug #72740 Tidy up conditional branching

Related test should be updated accordingly, to reflect
both the actual response and the one returned w/o
the initial b1b44e0 commit.

Author: scara

src/php5/solr_functions_params.c

@@ -713,10 +713,8 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
 	{
 		solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
 
-		if (current_ptr->contents.arg_list.delimiter_override) {
-		    if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
-		        solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
-		    }
+		if (current_ptr->contents.arg_list.delimiter_override && strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
+		    solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
 		} else {
 		    solr_string_appendc(&tmp_buffer, separator);
 		}
@@ -732,10 +730,8 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
 
 	solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
 
-	if (current_ptr->contents.arg_list.delimiter_override) {
-	    if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
-	        solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
-	    }
+	if (current_ptr->contents.arg_list.delimiter_override && strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
+	    solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
 	} else {
 	    solr_string_appendc(&tmp_buffer, separator);
 	}

src/php7/solr_functions_params.c

@@ -700,10 +700,8 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
 	{
 		solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
 
-		if (current_ptr->contents.arg_list.delimiter_override) {
-		    if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
-		        solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
-		    }
+		if (current_ptr->contents.arg_list.delimiter_override && strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
+		    solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
 		} else {
 		    solr_string_appendc(&tmp_buffer, separator);
 		}
@@ -719,10 +717,8 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
 
 	solr_string_append_solr_string(&tmp_buffer, &(current_ptr->contents.arg_list.value));
 
-	if (current_ptr->contents.arg_list.delimiter_override) {
-	    if (strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
-	        solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
-	    }
+	if (current_ptr->contents.arg_list.delimiter_override && strlen(current_ptr->contents.arg_list.delimiter_override) > 0) {
+	    solr_string_appendc(&tmp_buffer, *current_ptr->contents.arg_list.delimiter_override);
 	} else {
 	    solr_string_appendc(&tmp_buffer, separator);
 	}

tests/bug_72740.phpt

@@ -57,7 +57,7 @@ SolrObject Object
     [q] => *:*
     [defType] => edismax
     [indent] => on
-    [qf] => score manufacturedate_dt
+    [qf] => score^ manufacturedate_dt^
     [pf] => phraseField1~5^10 phraseField2~1^5
     [sort] => score desc,manufacturedate_dt desc
     [version] => 2.2