Skip to content

Fixed installation errors #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cadreoneseven wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed installation errors #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/install/resources/utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static function checkDbConnection($db_type, $db_hostname, $db_hostport, $db_user
$db_exist_status = true;
if(!$db_utf8_support) {
// Check if the database that we are going to use supports UTF-8
$db_utf8_support = check_db_utf8_support($conn);
$db_utf8_support = self::check_db_utf8_support($conn);
}
}
$conn->Close();
Expand Down Expand Up @@ -175,7 +175,7 @@ static function checkDbConnection($db_type, $db_hostname, $db_hostport, $db_user
//crmv@208173
//Added to check database charset and $default_charset are set to UTF8.
//If both are not set to be UTF-8, Then we will show an alert message.
function check_db_utf8_support($conn) {
static function check_db_utf8_support($conn) {
global $db_type;
//crmv@charset
if($db_type !== 'mysql')
Expand Down Expand Up @@ -1061,4 +1061,4 @@ function get_logo_install($mode){
return $logo_path;
}
//crmv@18123e
?>
?>
10 changes: 6 additions & 4 deletions modules/ModComments/ModComments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ static function addWidgetTo($moduleNames, $widgetType='DETAILVIEWWIDGET', $widge
}
if ($commentWidgetCount) {
$modCommentsModule = Vtecrm_Module::getInstance('ModComments');
$modCommentsModule->addLink('HEADERSCRIPT', 'ModCommentsCommonHeaderScript', 'modules/ModComments/ModCommentsCommon.js');
$modCommentsRelatedToField = Vtecrm_Field::getInstance('related_to', $modCommentsModule);
$modCommentsRelatedToField->setRelatedModules($moduleNames);
if (is_object($modCommentsModule)) {
$modCommentsModule->addLink('HEADERSCRIPT', 'ModCommentsCommonHeaderScript', 'modules/ModComments/ModCommentsCommon.js');
$modCommentsRelatedToField = Vtecrm_Field::getInstance('related_to', $modCommentsModule);
$modCommentsRelatedToField->setRelatedModules($moduleNames);
}
}
}

Expand Down Expand Up @@ -149,4 +151,4 @@ function addWidgetToAll() {
}
}
}
?>
?>
4 changes: 2 additions & 2 deletions modules/MyNotes/MyNotes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ function addWidgetTo($moduleNames, $onlyWidget=false, $widgetType='DETAILVIEWWID
Array($currentModuleInstance->id, $module->id, 'get_related_list', $moduleName));
if ($check && $adb->num_rows($check) > 0) {
// do nothing
} else {
} else if (is_object($currentModuleInstance) && method_exists($currentModuleInstance,'setRelatedList')){
$currentModuleInstance->setRelatedList($module, $moduleName, Array('SELECT','ADD'), 'get_related_list');
}
}
Expand Down Expand Up @@ -374,4 +374,4 @@ function getAdvancedPermissionFunction($is_admin,$module,$actionname,$record_id)
}
}
}
?>
?>