View GitHub Repository SuiteCRM

Schedule Inspection
Subscribe
Completed
Push — develop ( 7c1bda...edae1e )
by Adam
18:38 queued 03:14
created
Category
Toggle Patches
modules/EmailTemplates/templateFields.php 1 patch
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2 
+if (!defined('sugarEntry') || !sugarEntry) {
3 
+    die('Not A Valid Entry Point');
4 
+}
3 5
4 6
5 7 
 function generateFieldDefsJS2()
 
@@ -47,7 +49,9 @@  discard block
 
 block discarded – undo
47 49 
             $focus = new $beanList[$key];
48 50 
             $loopControl[$key][$key] = $focus;
49 51 
             $prefixes[$key] = strtolower($focus->object_name) . '_';
50 
-            if ($focus->object_name == 'Case') $prefixes[$key] = 'a' . strtolower($focus->object_name) . '_';
52 
+            if ($focus->object_name == 'Case') {
53 
+                $prefixes[$key] = 'a' . strtolower($focus->object_name) . '_';
54 
+            }
51 55 
         }
52 56 
     }
53 57 
 
@@ -94,8 +98,9 @@  discard block
 
 block discarded – undo
94 98 
                         break;
95 99 
                     }
96 100 
                 }
97 
-                if ($dup)
98 
-                    $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
101 
+                if ($dup) {
102 
+                                    $collection[$collectionKey][] = array("name" => $optionKey, "value" => $optionLabel);
103 
+                }
99 104 
             }
100 105 
         }
101 106 
     }
Please login to merge, or discard this patch.
modules/FP_events/responseEntryPoint.php 1 patch
Braces   +18 added lines, -31 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2 
+if(!defined('sugarEntry') || !sugarEntry) {
3 
+    die('Not A Valid Entry Point');
4 
+}
3 5
4 6 
 	global $db;
5 7 
 	 
@@ -29,16 +31,13 @@  discard block
 
 block discarded – undo
29 31
30 32 
                     $url = $event->accept_redirect;
31 33 
                     header('Location: ' . $url);
32 
-                }
33 
-                else{
34 
+                } else{
34 35 
                     echo 'Thank you for accepting';
35 36 
                 }
36 
-    		}
37 
-    		else {
37 
+    		} else {
38 38 
     			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
39 39 
     		}
40 
-    	}
41 
-    	else if($response == 'decline'){
40 
+    	} else if($response == 'decline'){
42 41 
     		//check to see if they have already responded to the email
43 42 
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
44 43 
              $check = $db->getOne($check_q);
 
@@ -52,12 +51,10 @@  discard block
 
 block discarded – undo
52 51 
                     $url = $event->decline_redirect;
53 52 
                     header('Location: ' . $url);
54 53
55 
-                }
56 
-                else{
54 
+                } else{
57 55 
                     echo 'Thank you for declining';
58 56 
                 }
59 
-    		}
60 
-    		else {
57 
+    		} else {
61 58 
     			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
62 59 
     		}
63 60 
     	}
 
@@ -79,16 +76,13 @@  discard block
 
 block discarded – undo
79 76
80 77 
                     $url = $event->accept_redirect;
81 78 
                     header('Location: ' . $url);
82 
-                }
83 
-                else{
79 
+                } else{
84 80 
                     echo 'Thank you for accepting';
85 81 
                 }
86 
-            }
87 
-            else {
82 
+            } else {
88 83 
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
89 84 
             }
90 
-    	}
91 
-    	else if($response == 'decline'){
85 
+    	} else if($response == 'decline'){
92 86 
             //check to see if they have already responded to the email
93 87 
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
94 88 
              $check = $db->getOne($check_q);
 
@@ -101,12 +95,10 @@  discard block
 
 block discarded – undo
101 95 
                     $url = $event->decline_redirect;
102 96 
                     header('Location: ' . $url);
103 97
104 
-                }
105 
-                else{
98 
+                } else{
106 99 
                     echo 'Thank you for declining';
107 100 
                 }
108 
-            }
109 
-            else {
101 
+            } else {
110 102 
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
111 103 
             }
112 104 
     	}
 
@@ -127,16 +119,13 @@  discard block
 
 block discarded – undo
127 119
128 120 
                     $url = $event->accept_redirect;
129 121 
                     header('Location: ' . $url);
130 
-                }
131 
-                else{
122 
+                } else{
132 123 
                     echo 'Thank you for accepting';
133 124 
                 }
134 
-            }
135 
-            else {
125 
+            } else {
136 126 
                 echo 'There was a problem with the link please contact the sender of the invite';
137 127 
             }
138 
-    	}
139 
-    	else if($response == 'decline'){
128 
+    	} else if($response == 'decline'){
140 129 
     		//check to see if they have already responded to the email
141 130 
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
142 131 
              $check = $db->getOne($check_q);
 
@@ -150,12 +139,10 @@  discard block
 
 block discarded – undo
150 139 
                     $url = $event->decline_redirect;
151 140 
                     header('Location: ' . $url);
152 141
153 
-                }
154 
-                else{
142 
+                } else{
155 143 
                     echo 'Thank you for declining';
156 144 
                 }
157 
-            }
158 
-            else {
145 
+            } else {
159 146 
                 echo 'There was a problem with the link please contact the sender of the invite';
160 147 
             }
161 148 
     	}
Please login to merge, or discard this patch.
modules/Meetings/JoinExternalMeeting.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2 
+if(!defined('sugarEntry') || !sugarEntry) {
3 
+    die('Not A Valid Entry Point');
4 
+}
3 5 
 /*********************************************************************************
4 6 
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7 
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
@@ -56,7 +58,7 @@  discard block
 
 block discarded – undo
56 58 
 if ( $_REQUEST['host_meeting'] == '1' ) {
57 59 
     if($meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
58 60 
         SugarApplication::redirect($meetingBean->host_url);
59 
-    }else{
61 
+    } else{
60 62 
         //since they are now the owner of the meeting nor an Admin they cannot start the meeting.
61 63 
         $tplFile = 'modules/Meetings/tpls/extMeetingNoStart.tpl';
62 64 
         if ( file_exists('custom/'.$tplFile) ) {
 
@@ -68,10 +70,10 @@  discard block
 
 block discarded – undo
68 70 
         $ss->assign('bean',$meetingBean->toArray());
69 71 
         $ss->display($tplFile);
70 72 
     }
71 
-}else{
73 
+} else{
72 74 
     if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
73 75 
       SugarApplication::redirect($meetingBean->join_url);
74 
-    }else{
76 
+    } else{
75 77 
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
76 78 
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';
77 79 
         if ( file_exists('custom/'.$tplFile) ) {
Please login to merge, or discard this patch.
modules/Meetings/MeetingsQuickCreate.php 1 patch
Braces   +12 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2 
+if(!defined('sugarEntry') || !sugarEntry) {
3 
+    die('Not A Valid Entry Point');
4 
+}
3 5 
 /*********************************************************************************
4 6 
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7 
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
@@ -75,12 +77,15 @@  discard block
 
 block discarded – undo
75 77 
         $this->javascript->setSugarBean($focus);
76 78 
         $this->javascript->addAllFields('');
77 79
78 
-		if (is_null($focus->date_start))
79 
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
80 
-		if (is_null($focus->time_start))
81 
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
82 
-		if (!isset ($focus->duration_hours))
83 
-			$focus->duration_hours = "1";
80 
+		if (is_null($focus->date_start)) {
81 
+					$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
82 
+		}
83 
+		if (is_null($focus->time_start)) {
84 
+					$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
85 
+		}
86 
+		if (!isset ($focus->duration_hours)) {
87 
+					$focus->duration_hours = "1";
88 
+		}
84 89
85 90
86 91 
         $date_start_array=explode(" ",trim($focus->date_start));
Please login to merge, or discard this patch.
modules/Meetings/SubPanelViewInvitees.php 1 patch
Braces   +13 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2 
+if(!defined('sugarEntry') || !sugarEntry) {
3 
+    die('Not A Valid Entry Point');
4 
+}
3 5 
 /*********************************************************************************
4 6 
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7 
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
@@ -66,14 +68,19 @@  discard block
 
 block discarded – undo
66 68
67 69 
 $button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
68 70 
 $button .= "<input type='hidden' name='module' value='Contacts'>\n";
69 
-if ($currentModule == 'Accounts') $button .= "<input type='hidden' name='account_id' value='$focus->id'>\n<input type='hidden' name='account_name' value='$focus->name'>\n";
71 
+if ($currentModule == 'Accounts') {
72 
+    $button .= "<input type='hidden' name='account_id' value='$focus->id'>\n<input type='hidden' name='account_name' value='$focus->name'>\n";
73 
+}
70 74 
 $button .= "<input type='hidden' name='return_module' value='".$currentModule."'>\n";
71 75 
 $button .= "<input type='hidden' name='return_action' value='".$action."'>\n";
72 76 
 $button .= "<input type='hidden' name='return_id' value='".$focus->id."'>\n";
73 77 
 $button .= "<input type='hidden' name='action'>\n";
74 78 
 $button .= "<tr><td>&nbsp;</td>";
75 
-if ($focus->parent_type == "Accounts") $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."' type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)."\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
76 
-else $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
79 
+if ($focus->parent_type == "Accounts") {
80 
+    $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."' type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)."\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
81 
+} else {
82 
+    $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
83 
+}
77 84 
 $button .= "<td><input title='".$app_strings['LBL_SELECT_USER_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_USER_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Users&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
78 85 
 $button .= "</tr></form></table>\n";
79 86 
 
@@ -102,8 +109,7 @@  discard block
 
 block discarded – undo
102 109 
     {
103 110 
         //todo move to themes
104 111 
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
105 
-    }
106 
-    else
112 
+    } else
107 113 
     {
108 114 
         //todo move to themes
109 115 
 		$xtpl->assign("ROW_COLOR", 'evenListRow');
 
@@ -135,8 +141,7 @@  discard block
 
 block discarded – undo
135 141 
     {
136 142 
         //todo move to themes
137 143 
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
138 
-    }
139 
-    else
144 
+    } else
140 145 
     {
141 146 
         //todo move to themes
142 147 
 		$xtpl->assign("ROW_COLOR", 'evenListRow');
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.module.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -87,11 +87,14 @@
 
 block discarded – undo
87 87 
 		$ajax = new AjaxCompose();
88 88 
 		$ajax->addCrumb($GLOBALS['mod_strings']['LBL_MODULEBUILDER'], 'ModuleBuilder.main("mb")');
89 89 
 		$ajax->addCrumb(' '. $package->name,'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$package->name.'")');
90 
-		if(empty($module_name))$module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
90 
+		if(empty($module_name)) {
91 
+		    $module_name = translate('LBL_NEW_MODULE', 'ModuleBuilder');
92 
+		}
91 93 
 		$ajax->addCrumb($module_name, '');
92 94 
 		$html=$smarty->fetch('modules/ModuleBuilder/tpls/MBModule/module.tpl');
93 
-		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule')
94 
-			$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
95 
+		if(!empty($_REQUEST['action']) && $_REQUEST['action']=='SaveModule') {
96 
+					$html .="<script>ModuleBuilder.treeRefresh('ModuleBuilder')</script>";
97 
+		}
95 98 
 		$ajax->addSection('center', translate('LBL_SECTION_MODULE', 'ModuleBuilder'), $html);
96 99
97 100 
 		echo $ajax->getJavascript();
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.searchview.php 1 patch
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -1,6 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
3 
-die ( 'Not A Valid Entry Point' ) ;
2 
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
3 
+    die ( 'Not A Valid Entry Point' ) ;
4 
+}
4 5 
 /*********************************************************************************
5 6 
  * SugarCRM Community Edition is a customer relationship management program developed by
6 7 
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
@@ -119,14 +120,18 @@  discard block
 
 block discarded – undo
119 120 
  			$ajax->addCrumb ( $_REQUEST [ 'view_package' ], 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $_REQUEST [ 'view_package' ] . '")' ) ;
120 121 
  			$ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $_REQUEST [ 'view_package' ] . "&view_module={$this->editModule}" . '")'  ) ;
121 122 
  			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view_module=' . $this->editModule. '&view_package=' . $_REQUEST['view_package'] . '")'  ) ;
122 
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
123 
+ 			if ( $layoutLabel == 'LBL_LAYOUTS' ) {
124 
+ 			    $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view=search&view_module=' .$this->editModule . '&view_package=' . $_REQUEST [ 'view_package' ] . '")'  ) ;
125 
+ 			}
123 126 
  			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), '' ) ;
124 127 
  		} else
125 128 
  		{
126 129 
  			$ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
127 130 
  			$ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")'  ) ;
128 131 
  			$ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")'  ) ;
129 
- 			if ( $layoutLabel == 'LBL_LAYOUTS' ) $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
132 
+ 			if ( $layoutLabel == 'LBL_LAYOUTS' ) {
133 
+ 			    $ajax->addCrumb ( translate ( 'LBL_SEARCH_FORMS', 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=search&view_module=' .$this->editModule . '")' ) ;
134 
+ 			}
130 135 
  			$ajax->addCrumb ( translate ( $searchLabel, 'ModuleBuilder' ), ''  ) ;
131 136 
  		}
132 137 
  		$this->title = $searchLabel;
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.relationship.php 1 patch
Braces   +10 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -120,8 +120,9 @@  discard block
 
 block discarded – undo
120 120
121 121 
         $cardinality = array ( MB_ONETOONE => translate ( 'LBL_ONETOONE' ) , MB_ONETOMANY => translate ( 'LBL_ONETOMANY' ) , MB_MANYTOONE=> translate ( 'LBL_MANYTOONE' ), MB_MANYTOMANY => translate ( 'LBL_MANYTOMANY' ), ) ;
122 122
123 
-        if (!$this->fromModuleBuilder)
124 
-            unset($cardinality[MB_MANYTOONE]);
123 
+        if (!$this->fromModuleBuilder) {
124 
+                    unset($cardinality[MB_MANYTOONE]);
125 
+        }
125 126
126 127 
         $relationships = $module->getRelationships () ;
127 128 
         
@@ -136,7 +137,7 @@  discard block
 
 block discarded – undo
136 137 
 	            $definition['lhs_label'] = isset($modStrings[$relationship->getTitleKey()])?$modStrings[$relationship->getTitleKey()] : $relationship->lhs_module;
137 138 
 	            $modStrings = return_module_language( $selected_lang, $relationship->lhs_module, true ) ;
138 139 
 	    		$definition['rhs_label'] = isset($modStrings[$relationship->getTitleKey(true)])?$modStrings[$relationship->getTitleKey(true)] : $relationship->rhs_module ;
139 
-			}else{
140 
+			} else{
140 141 
 				#30624
141 142 
 				if(!empty($_REQUEST['rhs_module'])){
142 143 
 					$definition['rhs_label'] = $_REQUEST['rhs_module'];
 
@@ -254,12 +255,14 @@  discard block
 
 block discarded – undo
254 255 
                     }
255 256 
                     $this->smarty->assign ( 'relationship_role_column_enum', $validRoleColumnFields ) ;
256 257 
                 }
257 
-                if (! empty ( $relationship->relationship_role_column_value ))
258 
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
258 
+                if (! empty ( $relationship->relationship_role_column_value )) {
259 
+                                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
260 
+                }
259 261 
                 break ;
260 262 
             case MB_MANYTOMANY :
261 
-                if (! empty ( $relationship->relationship_role_column_value ))
262 
-                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
263 
+                if (! empty ( $relationship->relationship_role_column_value )) {
264 
+                                    $this->smarty->assign ( 'relationship_role_column_value', $relationship->relationship_role_column_value ) ;
265 
+                }
263 266 
                 break ;
264 267 
         }
265 268
Please login to merge, or discard this patch.
modules/ModuleBuilder/views/view.popupview.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -1,6 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
2 
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
3 3 
     die ( 'Not A Valid Entry Point' ) ;
4 
+}
4 5 
 /*********************************************************************************
5 6 
  * SugarCRM Community Edition is a customer relationship management program developed by
6 7 
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
@@ -125,7 +126,7 @@  discard block
 
 block discarded – undo
125 126
126 127 
             $ViewLabel = ($this->editLayout == MB_POPUPLIST) ? 'LBL_POPUPLISTVIEW' : 'LBL_POPUPSEARCH';
127 128 
             $ajax->addCrumb ( translate ($ViewLabel, 'ModuleBuilder' ), '' ) ;
128 
-        }else{
129 
+        } else{
129 130 
             $ajax->addCrumb ( translate($this->editModule), 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_module=' . $this->editModule . '")' ) ;
130 131 
             $ajax->addCrumb ( translate('LBL_LAYOUTS', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&layouts=1&view_module=' . $this->editModule . '")');
131 132 
             $ajax->addCrumb ( translate('LBL_POPUP', 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view=popup&view_module=' . $this->editModule . '")' );
 
@@ -184,8 +185,9 @@  discard block
 
 block discarded – undo
184 185
185 186
186 187 
         $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")" ;
187 
-        if (isset($this->searchlayout))
188 
-            $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
188 
+        if (isset($this->searchlayout)) {
189 
+                    $histaction = "ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$this->searchlayout}\")" ;
190 
+        }
189 191
190 192 
         $buttons = array ( ) ;
191 193 
         if (! $this->fromModuleBuilder)
Please login to merge, or discard this patch.