[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Installer: skip mail queue check before schema exists
"ushindi bienvenu \(@usbbush\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6a282b978b4b1_389779f0888231@gitlab-sidekiq-low-urgency-cpu-bound-v2-d4ddd5fd7-zcxlp.mail> |
ushindi bienvenu pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
4f5af7f5 by Alfred Syatsukwa at 2026-06-09T14:46:22+00:00
[FIX] Installer: skip mail queue check before schema exists
---
* [FIX] Installer: skip mail queue check before schema exists
See merge request tikiwiki/tiki!10472
- - - - -
1 changed file:
- installer/tiki-installer.php
Changes:
=====================================
installer/tiki-installer.php
=====================================
@@ -478,14 +478,17 @@ if ($dbconn) {
$has_tiki_db = has_tiki_db();
$smarty->assign('tikidb_created', $has_tiki_db);
$unsupportedMailQueueEntries = 0;
- try {
- $unsupportedMailQueueEntries = (int) TikiDb::get()->getOne(
- 'SELECT COUNT(*) FROM tiki_mail_queue WHERE message LIKE ? OR message LIKE ? OR message LIKE ? OR message LIKE ?',
- ['%Laminas\\Mail\\Message%', '%Zend\\Mail\\Message%', '%LaminasMailMessage%', '%ZendMailMessage%'],
- TikiDb::ERR_NONE
- );
- } catch (Throwable $e) {
- $unsupportedMailQueueEntries = 0;
+ // Only check when the mail queue table exists (not during early install steps before schema creation)
+ if ($installer && $installer->tableExists('tiki_mail_queue')) {
+ try {
+ $unsupportedMailQueueEntries = (int) TikiDb::get()->getOne(
+ 'SELECT COUNT(*) FROM tiki_mail_queue WHERE message LIKE ? OR message LIKE ? OR message LIKE ? OR message LIKE ?',
+ ['%Laminas\\Mail\\Message%', '%Zend\\Mail\\Message%', '%LaminasMailMessage%', '%ZendMailMessage%'],
+ TikiDb::ERR_NONE
+ );
+ } catch (Throwable $e) {
+ $unsupportedMailQueueEntries = 0;
+ }
}
if ($unsupportedMailQueueEntries > 0) {
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4f5af7f511fec61c133980a05f2b8e8db7871afd
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4f5af7f511fec61c133980a05f2b8e8db7871afd
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs