Index: branches/5.2.x/core/install/upgrades.sql =================================================================== diff -u -r16569 -r16588 --- branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16569) +++ branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 16588) @@ -2946,3 +2946,7 @@ UPDATE LanguageLabels SET l1_Translation = 'Incorrect date format, please use ({format}) ex. ({sample})' WHERE PhraseKey = 'LA_ERR_BAD_DATE_FORMAT'; + +UPDATE LanguageLabels +SET l1_HintTranslation = REPLACE(l1_HintTranslation, '
  • This deploy script will reset all caches at once
    • ', '
  • This deploy script will reset all caches at once.
    • \r\n
  • This deploy script will dump production assets.
    • \r\n') +WHERE PhraseKey = 'LA_TITLE_SYSTEMTOOLSDEPLOY'; Index: branches/5.2.x/core/admin_templates/tools/system_tools.tpl =================================================================== diff -u -r16339 -r16588 --- branches/5.2.x/core/admin_templates/tools/system_tools.tpl (.../system_tools.tpl) (revision 16339) +++ branches/5.2.x/core/admin_templates/tools/system_tools.tpl (.../system_tools.tpl) (revision 16588) @@ -133,13 +133,21 @@ "/> -
    +

    "/>
    + +
    +

    +
    + +
    + "/> +
    @@ -307,4 +315,4 @@ - \ No newline at end of file + Index: branches/5.2.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -r16513 -r16588 --- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 16513) +++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 16588) @@ -1,6 +1,6 @@ Name, $system_events) ) { @@ -499,6 +500,28 @@ } /** + * Dumps assets + * + * @param kEvent $event Event. + * + * @return void + */ + protected function OnDumpAssets(kEvent $event) + { + if ( $this->Application->GetVar('ajax') == 'yes' ) { + $event->status = kEvent::erSTOP; + } + + /** @var MinifyHelper $minify_helper */ + $minify_helper = $this->Application->recallObject('MinifyHelper'); + + $minify_helper->delete(); + $minify_helper->dump(); + + $event->SetRedirectParam('action_completed', 1); + } + + /** * Saves grid column widths after their resize by user * * @param kEvent $event Index: branches/5.2.x/core/install/english.lang =================================================================== diff -u -r16584 -r16588 --- branches/5.2.x/core/install/english.lang (.../english.lang) (revision 16584) +++ branches/5.2.x/core/install/english.lang (.../english.lang) (revision 16588) @@ -34,6 +34,7 @@ RGVwbG95 RGVzaWduIE1vZGU= RG93bg== + RHVtcA== RWRpdA== RWRpdCBCbG9jaw== RWRpdCBDb250ZW50 @@ -1543,7 +1544,8 @@ U3lzdGVtIFRvb2xz Q2xlYXIgVGVtcGxhdGVzIENhY2hl Q29tbW9ubHkgVXNlZCBLZXlz - RGVwbG95IENoYW5nZXM= + RGVwbG95IENoYW5nZXM= + RHVtcCBBc3NldHM= S2V5IE5hbWU= S2V5IFZhbHVl TG9jYXRlIFVuaXQgQ29uZmlnIEZpbGU= Index: branches/5.2.x/core/units/helpers/minifiers/minify_helper.php =================================================================== diff -u -r16573 -r16588 --- branches/5.2.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 16573) +++ branches/5.2.x/core/units/helpers/minifiers/minify_helper.php (.../minify_helper.php) (revision 16588) @@ -1,6 +1,6 @@ Application->recallObject('CurlHelper'); + $curl_helper->setOptions(array( + CURLOPT_COOKIE => 'debug_off=1', + )); + $curl_helper->Send($this->Application->BaseURL()); + } + + /** * Compress $string based on $extension * * @param string $string Index: branches/5.2.x/core/units/helpers/deployment_helper.php =================================================================== diff -u -r16572 -r16588 --- branches/5.2.x/core/units/helpers/deployment_helper.php (.../deployment_helper.php) (revision 16572) +++ branches/5.2.x/core/units/helpers/deployment_helper.php (.../deployment_helper.php) (revision 16588) @@ -1,6 +1,6 @@ dryRun ) { $this->resetCaches(); $this->refreshThemes(); + $this->dumpAssets(); } if ( !$this->isCommandLine ) { @@ -356,6 +357,18 @@ } /** + * Dumps assets + * + * @return void + */ + private function dumpAssets() + { + $this->out('Dumping Assets ... '); + $this->_event->CallSubEvent('OnDumpAssets'); + $this->displayStatus('OK'); + } + + /** * Runs database upgrade script * * @return bool Index: branches/5.2.x/core/units/helpers/themes_helper.php =================================================================== diff -u -r16513 -r16588 --- branches/5.2.x/core/units/helpers/themes_helper.php (.../themes_helper.php) (revision 16513) +++ branches/5.2.x/core/units/helpers/themes_helper.php (.../themes_helper.php) (revision 16588) @@ -1,6 +1,6 @@ Application->incrementCacheSerial('theme'); $this->Application->incrementCacheSerial('theme-file'); - - /** @var MinifyHelper $minify_helper */ - $minify_helper = $this->Application->recallObject('MinifyHelper'); - - $minify_helper->delete(); } /**