0
@@ -224,8 +224,7 @@
0
   
0
   function set_property_value($name, $value, $lang = 'en_US')
0
   {
0
-		if ($this->prop_names != '' && count($this->mProperties) == 0)
0
-			$this->load_properties();
0
+		$this->load_properties(false);
0
 
0
     foreach ($this->mProperties as &$prop)
0
     {
0
0
0
0
@@ -279,16 +278,18 @@
0
     return in_array($name, explode(',', $this->prop_names));
0
   }
0
   
0
-	function load_properties()
0
+	function load_properties($force = true)
0
   {
0
-		//No go.  Ok, load all of them...
0
-		$props = cmsms()->content_property->find_all_by_content_id($this->id);
0
-		foreach ($props as &$prop)
0
+		if ($force || $this->prop_names != '' && count($this->mProperties) == 0)
0
     {
0
-			//Make sure we don't overwrite any newly set properties
0
-			if (!in_array($prop->name, $this->get_loaded_property_names()))
0
+			$props = cmsms()->content_property->find_all_by_content_id($this->id);
0
+			foreach ($props as &$prop)
0
       {
0
-				$this->mProperties[] = $prop;
0
+				//Make sure we don't overwrite any newly set properties
0
+				if (!in_array($prop->name, $this->get_loaded_property_names()))
0
+				{
0
+					$this->mProperties[] = $prop;
0
+				}
0
       }
0
     }
0
   }
0
@@ -312,7 +313,7 @@
0
         }
0
       }
0
       
0
-			$this->load_properties();
0
+			$this->load_properties(false);
0
       
0
       //Loop through and see if it's loaded now
0
       foreach ($this->mProperties as &$prop)