Index: trunk/kernel/parser.php
===================================================================
diff -u -r13 -r29
--- trunk/kernel/parser.php	(.../parser.php)	(revision 13)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 29)
@@ -185,13 +185,15 @@
    $groupid = $objSession->Get("GroupId");
    if ($userid == 0)
    {
-      $t = $objTemplate->ParseTemplate($attribs["_logintemplate"]);
+      if (strlen($attribs["_logintemplate"]))
+   		$t = $objTemplate->ParseTemplate($attribs["_logintemplate"]);
       return $t;
    }
    else
    {
       $user =&  $objUsers->GetItem($userid);
-      $t = $user->ParseTemplate($attribs["_loggedintemplate"]);
+      if (strlen($attribs["_loggedintemplate"]))
+      	$t = $user->ParseTemplate($attribs["_loggedintemplate"]);
       return $t;
    }
 }
@@ -267,7 +269,7 @@
         $t = $attribs["_template"];
         if(!strlen($t))
         {
-            $t = "<inp:form_prompt />";
+            $templateText = "<inp:form_prompt />";
         }
         $e = $attribs["_errortemplate"];
         if(!strlen($e))
@@ -282,20 +284,24 @@
           if (strtolower($field) == "dob")  
           {
           	if (isset($FormError[strtolower($form)][strtolower($field."_day")]) || isset($FormError[strtolower($form)][strtolower($field."_month")]) || isset($FormError[strtolower($form)][strtolower($field."_year")])) 
-				$rawtext = $objTemplate->GetTemplate($e);
+				$rawtext = $objTemplate->GetTemplate($e, true);
           }
            
           if(isset($FormError[strtolower($form)][strtolower($field)]))
           {
              $rawtext = $objTemplate->GetTemplate($e);
           }
-          else
-            $rawtext = $objTemplate->GetTemplate($t);
+          elseif (strlen($t))
+            $rawtext = $objTemplate->GetTemplate($t);         
+           
         if(is_object($rawtext))
         {
           $src = $rawtext->source;
-          $o = str_replace("<inp:form_prompt />",$txt,$src);
+          $o = str_replace("<inp:form_prompt />",$txt, $src);
         }
+        else
+        	$o = str_replace("<inp:form_prompt />", $txt, $templateText);
+        	
     }
     return $o;
 }
@@ -631,19 +637,25 @@
 
     $t = $attribs["_itemtemplate"];
     if(!strlen($t))
-        $t = "<inp:form_error />";
+        $templateText = "<inp:form_error />";
     $f = $attribs["_form"];
     $o = "";
-    $rawtext = $objTemplate->GetTemplate($t,true);
-    $src = $rawtext->source;  
+    if (strlen($t))
+    {   
+    	$rawtext = $objTemplate->GetTemplate($t, true);
+    	$src = $rawtext->source;  
+    }   
+    else
+    	$src = $templateText;
+    	
     //echo $f."<br>";  
     //echo $t."<br>";  
-    //echo "<PRE>"; print_r($FormError); echo "</pre>";
+//    echo "<PRE>"; print_r($FormError); echo "</pre>";
     if(is_array($FormError[$f]))
     {    
       foreach($FormError[$f] as $e)
       {
-        $o .= str_replace("<inp:form_error />",$e,$src);
+        $o .= str_replace("<inp:form_error />",$e, $src);
       }
     }
     if(!strlen($o))      
@@ -1167,11 +1179,14 @@
       $CurrentTheme = $objThemes->GetItem($m_var_list["theme"]);
      
     $theme_url = "http://". ThisDomain().$objConfig->Get("Site_Path")."themes/".$CurrentTheme->Get("Name")."/";
-    if($attribs["_page"]) {
-        if ($attribs["_page"] != 'current') {
+    if($attribs["_page"])
+    {
+        if ($attribs["_page"] != 'current')
+        {
     		$theme_url .= $attribs["_page"];
         }
-        else {
+        else
+         {
         	$theme_url = "http://".ThisDomain().$objConfig->Get("Site_Path")."index.php?env=".BuildEnv();
         }
     }