From 000a2da283acfb170fe2d302addb020c3e6ce30e Mon Sep 17 00:00:00 2001
From: rollox <rollox@users.noreply.github.com>
Date: Mon, 6 Jun 2016 01:27:42 +0100
Subject: [PATCH] CRM-18743 - Undefined variable $order

Fix notice/error "Undefined variable: order in CRM_Contact_BAO_Query->prepareOrderBy()" on user/# screen if the viewed user page is linked to a contact record in Civi.

Also submitted to master.
---
 CRM/Contact/BAO/Query.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 4bf2395ece..6b53342e9e 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -5796,6 +5796,7 @@ AND   displayRelType.is_active = 1
    *   list(string $orderByClause, string $additionalFromClause).
    */
   protected function prepareOrderBy($sort, $sortByChar, $sortOrder, $additionalFromClause) {
+    $order = NULL;
     $config = CRM_Core_Config::singleton();
     if ($config->includeOrderByClause ||
       isset($this->_distinctComponentClause)
-- 
2.25.1