Merge branch 'development' of git://github.com/cykod/Webiva into post…

…-stream

app/models/content/core_feature/email_target_connect.rb

@@ -95,7 +95,6 @@ def self.email_target_connect_update(update_data, entry)
             return nil
           end
         rescue Exception => e
-          raise e.to_s
           return nil
         end
 

app/models/content_model.rb

@@ -188,7 +188,7 @@ def self.dynamic_field_info(field_name) #:nodoc:
     field_class = dynamic_fields_class(module_info)
 
     # return the class and the calling method
-    if field_class && field_class.dynamic_field_hash[field_info.to_sym]
+    if field_info && field_class && field_class.dynamic_field_hash[field_info.to_sym]
       field_method = "dynamic_#{field_info}_value"
       [ field_class, field_method ]
     else

vendor/modules/user_profile/app/models/user_profile_entry.rb

@@ -53,17 +53,11 @@ def self.fetch_entry(user_id,profile_type_id)
     end
     entry
   end
-
-  def method_missing(methd)
-    self.end_user.send(methd)
-  end
-
-  def name
-    self.end_user.name
-  end
-
-  def image 
-    self.end_user.image
+
+  %w(name image full_name first_name last_name gender dob source address billing_address work_address shipping_address salutation middle_name lead_source username cell_phone introduction suffix second_image).each do |fld|
+    class_eval <<-METHOD
+      def #{fld}; self.end_user.#{fld}; end
+    METHOD
   end
 
   def add_url