Commit 4669cf86 authored by George's avatar George
Browse files

Issue #3273890 - Fix responseToString() issue.

parent 8272000e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -144,13 +144,13 @@ class ConfigViewHelper {
  /**
   * Determines response type and returns string value of the object.
   *
   * @param object $arg
   * @param mixed $arg
   *   Response object from the result set.
   *
   * @return null|string
   *   String representation of the response object.
   */
  public static function responseToString(object $arg) {
  public static function responseToString($arg) {
    switch (gettype($arg)) {
      case 'boolean':
      case 'integer':
+3 −4
Original line number Diff line number Diff line
@@ -806,17 +806,16 @@ class ConfigViewQuery extends QueryPluginBase {
   * Converts relational query conditions into Query Entity.
   */
  private function addConjunctionGroupandConditions() {
    if (!empty($this->groupOperator)) {
      $this->query->conjunction = $this->groupOperator;

    }
    foreach ($this->conditions as $gr => $cnd) {

      if ($this->where[$gr]['type'] == 'OR') {
        $conditions = $this->query->orConditionGroup();
      }
      else {
        $conditions = $this->query->andConditionGroup();
      }

      foreach ($cnd['conditions'] as $sc) {
        $conditions->condition($sc[0], $sc[1], $sc[2]);
      }