X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=UpdateDatabase.php;h=d3ec063c95a0423afa74e430ff1558c78b5c3d8d;hp=8398e9d9fd201366c727aeeacda06e8c3a74d274;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=5e1bf272bb7aaaedc792136b28b0de9766885be2 diff --git a/UpdateDatabase.php b/UpdateDatabase.php index 8398e9d9..d3ec063c 100644 --- a/UpdateDatabase.php +++ b/UpdateDatabase.php @@ -67,6 +67,12 @@ class Pman_Core_UpdateDatabase extends Pman 'min' => 1, 'max' => 1, ), + 'skip-email-import' => array( + 'desc' => 'Skip email import', + 'default' => '', + 'min' => 1, + 'max' => 1, + ), 'procedures-only' => array( 'desc' => 'Only import procedures (not supported by most modules yet) - ignores sql directory', 'default' => '', @@ -243,18 +249,20 @@ class Pman_Core_UpdateDatabase extends Pman // this will trigger errors about freetext indexes - we will have to remove them manually.? // otherwise we need to do an sql query to find them, then remove them (not really worth it as it only affects really old code..) - + echo "Run extensions\n"; + $this->runExtensions(); if (empty($opts['data-only'])) { + echo "Import SQL\n"; $this->importSQL(); } if (!empty($opts['only-module-sql'])) { return; } - + echo "run Update Modules Data\n"; $this->runUpdateModulesData(); @@ -907,6 +915,9 @@ class Pman_Core_UpdateDatabase extends Pman function updateDataEmails() { + if (!empty($this->opts['skip-email-import'])) { + return; + } foreach ($this->emailTemplates as $k => $mail) { $mail_dir = "{$this->rootDir}{$mail['template_dir']}"; @@ -1217,6 +1228,7 @@ class Pman_Core_UpdateDatabase extends Pman if (!file_exists(__DIR__.'/UpdateDatabase/'. $scls .'.php')) { return; } + echo "Running : {$fn}\n"; require_once $fn; $c = new $cls();