From 3a6627340d810d27bef4d7c306590235e6e23da1 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 5 May 2014 14:21:38 -0500
Subject: [PATCH] oops: Fixup bad merge
Previously, there was a bug in the ORM where magic properties would need to
be declared in the model class.
---
include/class.user.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/class.user.php b/include/class.user.php
index c6c6b7535..974e89215 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -43,8 +43,6 @@ class UserModel extends VerySimpleModel {
)
);
- var $emails;
-
static function objects() {
$qs = parent::objects();
#$qs->select_related('default_email');
--
GitLab