From 4ac0f56455a5c552c1348f347210623a98d7215f Mon Sep 17 00:00:00 2001
From: Ultimate Member <umplugin@gmail.com>
Date: Wed, 16 Dec 2015 16:44:07 +0200
Subject: [PATCH] Fix for cronjobs and WP-CLI issues

---
 core/um-builtin.php | 10 +++++++---
 core/um-form.php    |  6 +++++-
 core/um-setup.php   |  6 ++++++
 um-init.php         | 10 +++++++---
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/core/um-builtin.php b/core/um-builtin.php
index 27632c14..076b9f21 100644
--- a/core/um-builtin.php
+++ b/core/um-builtin.php
@@ -2,6 +2,8 @@
 
 class UM_Builtin {
 
+	public $predefined_fields = array();
+
 	function __construct() {
 
 		add_action('init',  array(&$this, 'set_core_fields'), 1);
@@ -522,12 +524,14 @@ class UM_Builtin {
 	
 		global $ultimatemember;
 		
-		if ( class_exists('UM_Query') ) {
-			$um_roles = $ultimatemember->query->get_roles( false, array('admin') );
+		if ( !isset( $ultimatemember->query ) || ! method_exists( $ultimatemember->query, 'get_roles' ) ) {
+			return;
 		} else {
-			$um_roles = array();
+			//die('Method loaded!');
 		}
 		
+		$um_roles = $ultimatemember->query->get_roles( false, array('admin') );
+		
 		$profile_privacy = apply_filters('um_profile_privacy_options', array( __('Everyone','ultimatemember'), __('Only me','ultimatemember') ) );
 		
 		$this->predefined_fields = array(
diff --git a/core/um-form.php b/core/um-form.php
index 98f9919b..cd7a893c 100644
--- a/core/um-form.php
+++ b/core/um-form.php
@@ -43,7 +43,11 @@ class UM_Form {
 	***/
 	function field_declare(){
 		global $ultimatemember;
-		$this->all_fields = $ultimatemember->builtin->custom_fields;
+		if ( isset( $ultimatemember->builtin->custom_fields ) ) {
+			$this->all_fields = $ultimatemember->builtin->custom_fields;
+		} else {
+			$this->all_fields = null;
+		}
 	}
 	
 	/***
diff --git a/core/um-setup.php b/core/um-setup.php
index 393b4ae5..f6a47540 100644
--- a/core/um-setup.php
+++ b/core/um-setup.php
@@ -443,6 +443,12 @@ class UM_Setup {
 	
 		global $wpdb, $ultimatemember;
 		
+		if ( !isset( $ultimatemember->query ) || ! method_exists( $ultimatemember->query, 'get_roles' ) ) {
+			return;
+		} else {
+			//die('Method loaded!');
+		}
+			
 		$admin = $ultimatemember->query->find_post_id('um_role','_um_core','admin');
 
 		if ( !$admin && current_user_can('manage_options') && um_user('ID') ){
diff --git a/um-init.php b/um-init.php
index d676038d..33e8b761 100644
--- a/um-init.php
+++ b/um-init.php
@@ -4,6 +4,8 @@ class UM_API {
 
 	public $is_filtering;
 	
+	public $addons = null;
+	
 	function __construct() {
 	
 		$this->is_filtering = 0;
@@ -56,9 +58,11 @@ class UM_API {
 	***/
 	function load_addons() {
 		global $ultimatemember;
-		foreach( $ultimatemember->addons as $addon => $name ) {
-			if ( um_get_option('addon_' . $addon ) == 1 ) {
-				include_once um_path . 'addons/'.$addon.'.php';
+		if ( isset( $ultimatemember->addons ) && is_array( $ultimatemember->addons ) ) {
+			foreach( $ultimatemember->addons as $addon => $name ) {
+				if ( um_get_option('addon_' . $addon ) == 1 ) {
+					include_once um_path . 'addons/'.$addon.'.php';
+				}
 			}
 		}
 	}