From d8981c682a43752f1f049fe177dc1a1c3ea5da80 Mon Sep 17 00:00:00 2001 From: John Mertic Date: Mon, 23 Jul 2012 00:15:05 -0400 Subject: [PATCH] Release 6.5.2 --- data/BeanFactory.php | 18 +++--------------- data/Link2.php | 3 +-- files.md5 | 10 +++++----- include/globalControlLinks.php | 5 +++-- sugar_version.php | 8 ++++---- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/data/BeanFactory.php b/data/BeanFactory.php index 2fb34a7a..fe2c1387 100644 --- a/data/BeanFactory.php +++ b/data/BeanFactory.php @@ -54,26 +54,14 @@ class BeanFactory { * Returns a SugarBean object by id. The Last 10 loaded beans are cached in memory to prevent multiple retrieves per request. * If no id is passed, a new bean is created. * @static - * @param String $module + * @param String $module * @param String $id - * @param Array $params A name/value array of parameters. Names: encode, deleted, - * If $params is boolean we revert to the old arguments (encode, deleted), and use $params as $encode. - * This will be changed to using only $params in later versions. + * @param Bool $encode @see SugarBean::retrieve * @param Bool $deleted @see SugarBean::retrieve * @return SugarBean */ - public static function getBean($module, $id = null, $params = array(), $deleted = true) + public static function getBean($module, $id = null, $encode = true, $deleted = true) { - - // Check if params is an array, if not use old arguments - if (isset($params) && !is_array($params)) { - $params = array('encode' => $params); - } - - // Pull values from $params array - $encode = isset($params['encode']) ? $params['encode'] : true; - $deleted = isset($params['deleted']) ? $params['deleted'] : $deleted; - if (!isset(self::$loadedBeans[$module])) { self::$loadedBeans[$module] = array(); self::$touched[$module] = array(); diff --git a/data/Link2.php b/data/Link2.php index f0a331ac..c7e337a5 100644 --- a/data/Link2.php +++ b/data/Link2.php @@ -531,8 +531,7 @@ class Link2 { */ protected function getRelatedBean($id = false) { - $params = array('encode' => true, 'deleted' => true); - return BeanFactory::getBean($this->getRelatedModuleName(), $id, $params); + return BeanFactory::getBean($this->getRelatedModuleName(), $id); } public function &__get($name) diff --git a/files.md5 b/files.md5 index d8cb604c..06d6a5ba 100644 --- a/files.md5 +++ b/files.md5 @@ -1,5 +1,5 @@ 'd3f150e4a5bed444763ebe8a81742a95', './.htaccess' => 'd41d8cd98f00b204e9800998ecf8427e', @@ -651,7 +651,7 @@ $md5_string = array ( './include/SugarDependentDropdown/javascript/SugarDependentDropdown.js' => '4d077b3991c83098e4bca166bc715071', './include/SugarDependentDropdown/SugarDependentDropdown.php' => '86eb13e7c54068ec87679e98a4e0d406', './include/export_utils.php' => '885a0dd6cda051658520a90f522f787f', - './include/globalControlLinks.php' => '7023363f444dd1d4ba94cab9bf1a471d', + './include/globalControlLinks.php' => '7bb7851575077b76cc686c8f69929789', './include/SugarTinyMCE.php' => 'a00a969d2a2df9dbbc80ead4af9b40de', './include/tabs.php' => '7cf9418691424c673218c535fec27a05', './include/SugarOAuthServer.php' => '2213c81d7cef1884997b4a0d38216fd9', @@ -3286,7 +3286,7 @@ $md5_string = array ( './json_server.php' => '04bdab8fb6160b89d42c2138429815f6', './SugarSecurity.php' => 'e87f1efee51af1d8801dc2376068cee3', './export.php' => '7639b2373c4d0c73765033d70abfb55d', - './data/BeanFactory.php' => '5148eb779611ca40e342900456fc6f29', + './data/BeanFactory.php' => 'b48ced42ffd6cc74d6bc14f334511919', './data/SugarBean.php' => 'beb5df6b33dd3bb220b70f4bb562b6ec', './data/Link.php' => 'de95f31cf30c2f46a234c4a840c01f84', './data/Relationships/One2OneRelationship.php' => 'f72bfcb39e5c6c6092c41e148f464abf', @@ -3297,7 +3297,7 @@ $md5_string = array ( './data/Relationships/One2OneBeanRelationship.php' => 'ec639e887d2ff4bb0d16725b2a33b9ac', './data/Relationships/SugarRelationship.php' => '7ecdecd5a7623b1f5a251286ffa48893', './data/Relationships/One2MRelationship.php' => '9b90a0634f9c68460f6524069d0f60eb', - './data/Link2.php' => '08607d058075f66208b31b82037563b3', + './data/Link2.php' => '9a423dd110cacdb3b6b9662b62403e2c', './data/Tracker.php' => '78c6ca1fadfe9e7984b001fed296f332', './service/core/SugarRestUtils.php' => '183a0d813c88928451133af63934b686', './service/core/webservice.php' => '7f6d3c42e37ee818424a35bb86f996a4', @@ -5324,7 +5324,7 @@ $md5_string = array ( './metadata/prospect_lists_prospectsMetaData.php' => 'fe3dc7d813428ca0fa774884a88ef5c4', './metadata/inboundEmail_autoreplyMetaData.php' => '7c670a62c7142827bbdf675c8b4be221', './metadata/acl_roles_actionsMetaData.php' => 'a3446107943a271bf6e329a80deb06e8', - './sugar_version.php' => '572db8864c136e6bc24499477089d108', + './sugar_version.php' => 'b80ef7f8b5db44580e762999677978ff', './cron.php' => '96a6fd7893809132e902086e77dde30c', './log4php/LoggerManager.php' => 'fa34194306cd50c01b71d8d5060ee362', './TreeData.php' => '7040af43bf01c450f4e225ece5e3f30c', diff --git a/include/globalControlLinks.php b/include/globalControlLinks.php index b672a7d0..bd66c5b1 100644 --- a/include/globalControlLinks.php +++ b/include/globalControlLinks.php @@ -68,12 +68,13 @@ $global_control_links['training'] = array( 'linkinfo' => array($app_strings['LBL_TRAINING'] => 'javascript:void(window.open(\'http://support.sugarcrm.com\'))'), 'submenu' => '' ); - +/* + Bug#53922: Remove the help link until its target is decided. $global_control_links['help'] = array( 'linkinfo' => array($app_strings['LNK_HELP'] => ' javascript:void window.open(\'index.php?module=Administration&action=SupportPortal&view=documentation&version='.$sugar_version.'&edition='.$sugar_flavor.'&lang='.$current_language.'&help_module='.$GLOBALS['module'].'&help_action='.$action.'&key='.$server_unique_key.'\')'), 'submenu' => '' ); - +*/ $global_control_links['users'] = array( 'linkinfo' => array($app_strings['LBL_LOGOUT'] => 'index.php?module=Users&action=Logout'), 'submenu' => '' diff --git a/sugar_version.php b/sugar_version.php index 0607f433..80069faa 100644 --- a/sugar_version.php +++ b/sugar_version.php @@ -38,10 +38,10 @@ -$sugar_version = '6.5.1'; -$sugar_db_version = '6.5.1'; +$sugar_version = '6.5.2'; +$sugar_db_version = '6.5.2'; $sugar_flavor = 'CE'; -$sugar_build = '8408'; -$sugar_timestamp = '2012-07-18 11:22am'; +$sugar_build = '8410'; +$sugar_timestamp = '2012-07-20 01:17pm'; ?> -- 2.42.0