Merge branch 'hotfix-7.8.x' into 7.8.x

salesagility · Feb 16, 2018 · 45bc4fb · 45bc4fb
2 parents cfcf2ad + 787012b
commit 45bc4fb
Show file tree

Hide file tree

Showing 171 changed files with 288 additions and 253 deletions.
diff --git a/README.md b/README.md
@@ -43,9 +43,9 @@ The following links offer various ways to view, contribute and collaborate to th
 + [SuiteCRM Extensions Directory - An extensions directory where community members can submit extensions built for SuiteCRM][suitecrm_ext]
 
 [suitecrm_demo]: https://suitecrm.com/demo
-[suitecrm_forums]: https://suitecrm.com/forum/index
+[suitecrm_forums]: https://suitecrm.com/suitecrm/forum/suite-forum
 [suitecrm_docs]: https://suitecrm.com/wiki
-[suitecrm_partners]: https://suitecrm.com/community/partners
+[suitecrm_partners]: https://suitecrm.com/about/about-us/partners
 [suitecrm_ext]: https://store.suitecrm.com/
 
 ### Development Roadmap ###

diff --git a/data/SugarBean.php b/data/SugarBean.php
@@ -1919,7 +1919,15 @@ public function save($check_notify = false)
             foreach ($this->email_addresses_non_primary as $mail) {
                 $this->emailAddress->addAddress($mail);
             }
-            $this->emailAddress->save($this->id, $this->module_dir);
+            $this->emailAddress->saveEmail(
+                $this->id,
+                $this->module_dir,
+                '',
+                '',
+                '',
+                '',
+                '',
+                $this->in_workflow);
         }
 
         if (isset($this->custom_fields)) {

diff --git a/include/Dashlets/Dashlet.php b/include/Dashlets/Dashlet.php
@@ -242,7 +242,9 @@ public function getHeader($text = '')
         $template->assign('CONFIGURE_ICON', $this->setConfigureIcon());
         $template->assign('REFRESH_ICON', $this->setRefreshIcon());
         $template->assign('DELETE_ICON',$this->setDeleteIcon());
-        $template->assign('DASHLET_MODULE',$this->seedBean->module_name);
+        if(!empty($this->seedBean->module_name)) {
+            $template->assign('DASHLET_MODULE', $this->seedBean->module_name);
+        }
         $template->assign('DASHLET_BUTTON_ARIA_EDIT', translate('LBL_DASHLET_EDIT', 'Home'));
         $template->assign('DASHLET_BUTTON_ARIA_REFRESH',  translate('LBL_DASHLET_REFRESH', 'Home'));
         $template->assign('DASHLET_BUTTON_ARIA_DELETE',  translate('LBL_DASHLET_DELETE', 'Home'));

diff --git a/include/ListView/ListViewColumnsFilterDialog.tpl b/include/ListView/ListViewColumnsFilterDialog.tpl
@@ -187,6 +187,8 @@
                         displayColumns: cols.join('|'),
                         query: 'true',
                         use_stored_query: 'true',
+                        update_stored_query: 'true',
+                        update_stored_query_key: 'displayColumns',
                         last_search_tab: listViewSearchIcon.getLatestSearchDialogType(),
                         save_columns_order: 'true'
                     }, function () {

diff --git a/include/ListView/ListViewSmarty.php b/include/ListView/ListViewSmarty.php
@@ -97,13 +97,13 @@ function process($file, $data, $htmlVar) {
 
         $totalWidth = 0;
         foreach($this->displayColumns as $name => $params) {
-            $totalWidth += $params['width'];
+            $totalWidth += trim($params['width'],'%');
         }
         $adjustment = $totalWidth / 100;
 
         $contextMenuObjectsTypes = array();
         foreach($this->displayColumns as $name => $params) {
-            $this->displayColumns[$name]['width'] = floor($this->displayColumns[$name]['width'] / $adjustment);
+            $this->displayColumns[$name]['width'] = floor(trim($this->displayColumns[$name]['width'],'%') / $adjustment);
             // figure out which contextMenu objectsTypes are required
             if(!empty($params['contextMenu']['objectType']))
                 $contextMenuObjectsTypes[$params['contextMenu']['objectType']] = true;

diff --git a/include/MVC/View/views/view.list.php b/include/MVC/View/views/view.list.php
@@ -148,6 +148,13 @@ function listViewPrepare()
         if (!isset($_REQUEST['query'])) {
             $this->storeQuery->loadQuery($this->module);
             $this->storeQuery->populateRequest();
+        } elseif (!empty($_REQUEST['update_stored_query'])) {
+            $updateKey = $_REQUEST['update_stored_query_key'];
+            $updateValue = $_REQUEST[$updateKey];
+            $this->storeQuery->loadQuery($this->module);
+            $this->storeQuery->populateRequest();
+            $_REQUEST[$updateKey] = $updateValue;
+            $this->storeQuery->saveFromRequest($this->module);
         } else {
             $this->storeQuery->saveFromRequest($this->module);
         }

diff --git a/include/SubPanel/SubPanelTiles.js b/include/SubPanel/SubPanelTiles.js
diff --git a/include/SubPanel/SubPanelTiles.php b/include/SubPanel/SubPanelTiles.php
@@ -344,7 +344,7 @@ function display($showContainer = true, $forceTabless = false)
                 $tabs_properties[$t]['show_icon_html'] = $show_icon_html;
                 $tabs_properties[$t]['hide_icon_html'] = $hide_icon_html;
 
-                $max_min = "<a name=\"$tab\"> </a><span id=\"show_link_".$tab."\" style=\"display: $opp_display\"><a href='#' class='utilsLink' onclick=\"current_child_field = '".$tab."';showSubPanel('".$tab."',null,null,'".$layout_def_key."');document.getElementById('show_link_".$tab."').style.display='none';document.getElementById('hide_link_".$tab."').style.display='';return false;\">"
+                $max_min = "<a name=\"$tab\"> </a><span id=\"show_link_".$tab."\" style=\"display: $opp_display\"><a href='#' class='utilsLink' onclick=\"current_child_field = '".$tab."';showSubPanel('".$tab."',null,true,'".$layout_def_key."');document.getElementById('show_link_".$tab."').style.display='none';document.getElementById('hide_link_".$tab."').style.display='';return false;\">"
                     . "" . $show_icon_html . "</a></span>";
                 $max_min .= "<span id=\"hide_link_".$tab."\" style=\"display: $div_display\"><a href='#' class='utilsLink' onclick=\"hideSubPanel('".$tab."');document.getElementById('hide_link_".$tab."').style.display='none';document.getElementById('show_link_".$tab."').style.display='';return false;\">"
                     . "" . $hide_icon_html . "</a></span>";

diff --git a/include/SugarEmailAddress/SugarEmailAddress.php b/include/SugarEmailAddress/SugarEmailAddress.php
@@ -103,7 +103,7 @@ public function handleLegacySave($bean)
             || !isset($_REQUEST[$bean->module_dir . '_email_widget_id'])
             || !isset($_REQUEST['massupdate'])
         ) {
-            if (empty($this->addresses)) {
+            if (empty($this->addresses) || (!empty($bean->email1))) {
                 $this->addresses = array();
                 $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == '1');
                 $invalid = (isset($bean->invalid_email) && $bean->invalid_email == '1');

diff --git a/include/SugarFields/Fields/Address/en_us.DetailView.tpl b/include/SugarFields/Fields/Address/en_us.DetailView.tpl
@@ -4,7 +4,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
  * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
- * Copyright (C) 2011 - 2014 Salesagility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarFields/Fields/Address/en_us.EditView.tpl b/include/SugarFields/Fields/Address/en_us.EditView.tpl
@@ -4,7 +4,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
  * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
- * Copyright (C) 2011 - 2014 Salesagility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/implements/assignable/language/en_us.lang.php b/include/SugarObjects/implements/assignable/language/en_us.lang.php
@@ -4,7 +4,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
  * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
- * Copyright (C) 2011 - 2014 Salesagility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/implements/security_groups/language/en_us.lang.php b/include/SugarObjects/implements/security_groups/language/en_us.lang.php
@@ -4,7 +4,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
- * Copyright (C) 2011 - 2016 Salesagility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/implements/team_security/language/en_us.lang.php b/include/SugarObjects/implements/team_security/language/en_us.lang.php
@@ -4,7 +4,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
  * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
- * Copyright (C) 2011 - 2014 Salesagility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/basic/language/en_us.lang.php b/include/SugarObjects/templates/basic/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/company/language/application/en_us.lang.php b/include/SugarObjects/templates/company/language/application/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/company/language/en_us.lang.php b/include/SugarObjects/templates/company/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/file/language/application/en_us.lang.php b/include/SugarObjects/templates/file/language/application/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/file/language/en_us.lang.php b/include/SugarObjects/templates/file/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/issue/language/application/en_us.lang.php b/include/SugarObjects/templates/issue/language/application/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/issue/language/en_us.lang.php b/include/SugarObjects/templates/issue/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/person/language/en_us.lang.php b/include/SugarObjects/templates/person/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/sale/language/application/en_us.lang.php b/include/SugarObjects/templates/sale/language/application/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/SugarObjects/templates/sale/language/en_us.lang.php b/include/SugarObjects/templates/sale/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/globalControlLinks.php b/include/globalControlLinks.php
@@ -68,7 +68,7 @@
 'submenu' => ''
 );
 $global_control_links['training'] = array(
-'linkinfo' => array($app_strings['LBL_TRAINING'] => 'javascript:void(window.open(\'http://suitecrm.com/forum/index\'))'),
+'linkinfo' => array($app_strings['LBL_TRAINING'] => 'javascript:void(window.open(\'https://suitecrm.com/suitecrm/forum/suite-forum\'))'),
 'submenu' => ''
  );
 

diff --git a/include/language/en_us.lang.php b/include/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the
@@ -3360,7 +3360,6 @@
 $app_list_strings['aor_chart_types']['line'] = 'Line chart';
 $app_list_strings['aor_chart_types']['pie'] = 'Pie chart';
 $app_list_strings['aor_chart_types']['radar'] = 'Radar chart';
-$app_list_strings['aor_chart_types']['polar'] = 'Polar chart';
 $app_list_strings['aor_chart_types']['stacked_bar'] = 'Stacked bar';
 $app_list_strings['aor_chart_types']['grouped_bar'] = 'Grouped bar';
 $app_list_strings['aor_scheduled_report_schedule_types']['monthly'] = 'Monthly';

diff --git a/include/language/en_us.notify_template.html b/include/language/en_us.notify_template.html
@@ -4,7 +4,7 @@
 * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
 * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
-* Copyright (C) 2011 - 2017 Salesagility Ltd.
+* Copyright (C) 2011 - 2018 SalesAgility Ltd.
 *
 * This program is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Affero General Public License version 3 as published by the

diff --git a/include/language/getJSLanguage.php b/include/language/getJSLanguage.php
@@ -69,13 +69,13 @@ function getJSLanguage()
 
         return;
     }
-    if (empty($_REQUEST['module']) || $_REQUEST['module'] === 'app_strings') {
+    if (empty($_REQUEST['modulename']) || $_REQUEST['modulename'] === 'app_strings') {
         $file = sugar_cached('jsLanguage/').$lang.'.js';
         if (!is_file($file)) {
             jsLanguage::createAppStringsCache($lang);
         }
     } else {
-        $module = clean_path($_REQUEST['module']);
+        $module = clean_path($_REQUEST['modulename']);
         $fullModuleList = array_merge($GLOBALS['moduleList'], $GLOBALS['modInvisList']);
         if (!isset($app_list_strings['moduleList'][$module]) && !in_array($module, $fullModuleList)) {
             echo 'Invalid module specified';

diff --git a/include/utils/sugar_file_utils.php b/include/utils/sugar_file_utils.php
@@ -77,7 +77,7 @@ function sugar_mkdir($pathname, $mode = null, $recursive = false, $context = nul
     }
 
     if ($result) {
-        if (!sugar_chmod($pathname, $mode)) {
+        if (!sugar_chmod($pathname, $mode)  && !is_writable($pathname)) {
             return false;
         }
         if (!empty($GLOBALS['sugar_config']['default_permissions']['user'])) {

diff --git a/install/installCommon.js b/install/installCommon.js
@@ -36,5 +36,5 @@
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 function showHelp(step)
-{url='http://www.sugarcrm.com/forums/';name='helpWindowPopup';window.open(url,name);}
+{url='https://suitecrm.com/suitecrm/forum/suite-forum';name='helpWindowPopup';window.open(url,name);}
 function setFocus(){focus=document.getElementById('button_next2');focus.focus();}
diff --git a/install/installSystemCheck.php b/install/installSystemCheck.php
@@ -406,7 +406,7 @@ function runCheck($install_script = false, $mod_strings = array())
         <hr>
     <div id="installcontrols">
         <form action="install3.php" method="post" name="theForm" id="theForm">
-            <input class="button" type="button" onclick="window.open('http://www.suitecrm.com/forum/index');" value="{$mod_strings['LBL_HELP']}" />
+            <input class="button" type="button" onclick="window.open('https://suitecrm.com/suitecrm/forum/suite-forum');" value="{$mod_strings['LBL_HELP']}" />
             <input class="button" type="button" name="Re-check" value="{$mod_strings['LBL_CHECKSYS_RECHECK']}" onclick="callSysCheck();" id="button_next2"/>
         </form>
     </div>

diff --git a/install/install_utils.php b/install/install_utils.php
@@ -957,8 +957,8 @@ function handleHtaccess(){
     Options +FollowSymLinks
     RewriteEngine On
     RewriteBase {$basePath}
-    RewriteRule ^cache/jsLanguage/(.._..).js$ index.php?entryPoint=jslang&module=app_strings&lang=$1 [L,QSA]
-    RewriteRule ^cache/jsLanguage/(\w*)/(.._..).js$ index.php?entryPoint=jslang&module=$1&lang=$2 [L,QSA]
+    RewriteRule ^cache/jsLanguage/(.._..).js$ index.php?entryPoint=jslang&modulename=app_strings&lang=$1 [L,QSA]
+    RewriteRule ^cache/jsLanguage/(\w*)/(.._..).js$ index.php?entryPoint=jslang&modulename=$1&lang=$2 [L,QSA]
 </IfModule>
 <FilesMatch "\.(jpg|png|gif|js|css|ico)$">
         <IfModule mod_headers.c>

diff --git a/install/language/en_us.lang.php b/install/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
  *
  * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
- * Copyright (C) 2011 - 2017 SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the
@@ -256,7 +256,7 @@
 	'LBL_DISABLED_DESCRIPTION_2'		=> 'After this change has been made, you may click the "Start" button below to begin your installation. <i>After the installation is complete, you will want to change the value for \'installer_locked\' to \'true\'.</i>',
 	'LBL_DISABLED_DESCRIPTION'			=> 'The installer has already been run once. As a safety measure, it has been disabled from running a second time. If you are absolutely sure you want to run it again, please go to your config.php file and locate (or add) a variable called \'installer_locked\' and set it to \'false\'. The line should look like this:',
 	'LBL_DISABLED_HELP_1'				=> 'For installation help, please visit the SuiteCRM',
-	'LBL_DISABLED_HELP_LNK'             => 'http://www.suitecrm.com/forum/index',
+	'LBL_DISABLED_HELP_LNK'             => 'https://suitecrm.com/suitecrm/forum/suite-forum',
 	'LBL_DISABLED_HELP_2'				=> 'support forums',
 	'LBL_DISABLED_TITLE_2'				=> 'SuiteCRM Installation has been Disabled',
 	'LBL_DISABLED_TITLE'				=> 'SuiteCRM Installation Disabled',

diff --git a/jssource/src_files/install/installCommon.js b/jssource/src_files/install/installCommon.js
@@ -40,7 +40,7 @@
 
 function showHelp(step)
 {
-  url = 'http://www.sugarcrm.com/forums/';
+  url = 'https://suitecrm.com/suitecrm/forum/suite-forum';
   name = 'helpWindowPopup';
   window.open(url,name);
 }

diff --git a/jssource/src_files/modules/Calendar/Cal.js b/jssource/src_files/modules/Calendar/Cal.js
@@ -1052,7 +1052,7 @@ $($.fullCalendar).ready(function () {
           + '</div>';
         var body = SUGAR.language.translate('app_strings', 'LBL_LOADING_PAGE');
 
-        if ($('#cal_module').val() != "Home") {
+        if ($('#cal_module').val() != "Home" && typeof(event.id) !== 'undefined') {
           element.qtip({
             content: {
               title: {

diff --git a/modules/ACL/language/en_us.lang.php b/modules/ACL/language/en_us.lang.php
@@ -5,7 +5,7 @@
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
  * SuiteCRM is an extension to SugarCRM Community Edition developed by Salesagility Ltd.
- * Copyright (C) 2011 - 2014 Salesagility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License version 3 as published by the