tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fixes 

Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
This commit is contained in:
fbsanchez 2019-05-16 12:28:46 +02:00
parent e7dbb55392
commit 034480bf88
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/extras/mr/28.sql
View File

@ -7,7 +7,6 @@ DELETE FROM `tevent_response` WHERE `name` LIKE 'Create Integria IMS&#
INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0); INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `also_mail`) VALUES ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official communication"), "admin", 1, 0);
INSERT INTO `tnotification_source_group` SELECT `id`,0 FROM `tnotification_source` WHERE `description`="Official communication";
UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication'; UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System status' OR `description` = 'Official communication';
UPDATE `tnotification_source` SET `icon`="icono_logo_pandora.png" WHERE `description` = 'Official communication'; UPDATE `tnotification_source` SET `icon`="icono_logo_pandora.png" WHERE `description` = 'Official communication';

6
pandora_console/general/register.php
View File

@ -156,10 +156,9 @@ if ($registration) {
false, false,
// Launch only if not being launch from 'initial'. // Launch only if not being launch from 'initial'.
!$initial, !$initial,
(($show_newsletter === true) ? 'show_newsletter_wizard()' : null) (($show_newsletter === true) ? 'force_run_newsletter()' : null)
); );
} } else {
if ($show_newsletter) { if ($show_newsletter) {
// Show newsletter wizard for current user. // Show newsletter wizard for current user.
newsletter_wiz_modal( newsletter_wiz_modal(
@ -168,6 +167,7 @@ if ($show_newsletter) {
!$registration && !$initial !$registration && !$initial
); );
} }
}
?> ?>
<script type="text/javascript"> <script type="text/javascript">

1
pandora_console/include/functions_update_manager.php
View File

@ -61,6 +61,7 @@ function update_manager_verify_registration()
*/ */
function config_wiz_process() function config_wiz_process()
{ {
global $config;
$email = get_parameter('email', false); $email = get_parameter('email', false);
$timezone = get_parameter('timezone', false); $timezone = get_parameter('timezone', false);
$language = get_parameter('language', false); $language = get_parameter('language', false);