Index: branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js =================================================================== diff -u -N -r11412 -r11418 --- branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js (.../thickbox.js) (revision 11412) +++ branches/RC/core/admin_templates/js/jquery/thickbox/thickbox.js (.../thickbox.js) (revision 11418) @@ -126,7 +126,7 @@ if (params.imageGroup) { // scan images in group to create Prev/Next links - var TB_TempArray = $('a[@rel=' + params.imageGroup + ']').get(); + var TB_TempArray = $('a[rel=' + params.imageGroup + ']').get(); for (var TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === '')); TB_Counter++) { var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString); if (!(TB_TempArray[TB_Counter].href == params.url)) { Index: branches/RC/core/admin_templates/js/uploader/upload_manager.js =================================================================== diff -u -N -r11406 -r11418 --- branches/RC/core/admin_templates/js/uploader/upload_manager.js (.../upload_manager.js) (revision 11406) +++ branches/RC/core/admin_templates/js/uploader/upload_manager.js (.../upload_manager.js) (revision 11418) @@ -4,10 +4,6 @@ UploadsManager._initAll(); } ); - - if (typeof Application != 'undefined') { - Application.setHook('m:OnAfterFormInit', UploadsManager.setScrollEvents); - } } UploadsManager = new UploadsManager(); @@ -100,6 +96,15 @@ } UploadsManager._createHooks = function () { + if (typeof Application != 'undefined') { + Application.setHook( + 'm:OnAfterFormInit', + function () { + UploadsManager.setScrollEvents(); + } + ); + } + // hooking to standard toolbar select button to peform auto-upload when Save is clicked if (!UploadsManager.useToolbar || !isset(a_toolbar)) { return ; Index: branches/RC/core/admin_templates/js/uploader/uploader.js =================================================================== diff -u -N -r11299 -r11418 --- branches/RC/core/admin_templates/js/uploader/uploader.js (.../uploader.js) (revision 11299) +++ branches/RC/core/admin_templates/js/uploader/uploader.js (.../uploader.js) (revision 11418) @@ -560,6 +560,7 @@ Uploader.prototype.onFlashReady = function() { this.disableBrowse(false); + UploadsManager.iterate('syncBrowseButton'); } Uploader.prototype.disableBrowse = function($disabled) { Index: branches/RC/core/install/upgrades.php =================================================================== diff -u -N -r11238 -r11418 --- branches/RC/core/install/upgrades.php (.../upgrades.php) (revision 11238) +++ branches/RC/core/install/upgrades.php (.../upgrades.php) (revision 11418) @@ -666,4 +666,50 @@ $this->Conn->Query($sql); } + + /** + * Update colors in skin (only if they were not changed manually) + * + * @param string $mode when called mode {before, after) + */ + function Upgrade_5_0_0($mode) + { + if ($mode == 'after') { + $skin =& $this->Application->recallObject('skin', null, Array ('skip_autoload' => 1)); + /* @var $skin kDBItem */ + + $skin->Load(1, 'IsPrimary'); + if ($skin->isLoaded()) { + $skin_options = unserialize( $skin->GetDBField('Options') ); + + $changes = Array ( + // option: from -> to + 'HeadBgColor' => Array ('#1961B8', '#007BF4'), + 'HeadBarColor' => Array ('#FFFFFF', '#000000'), + ); + + $can_change = true; + foreach ($changes as $option_name => $change) { + list ($change_from, $change_to) = $change; + + $can_change = $can_change && ($change_from == $skin_options[$option_name]['Value']); + if ($can_change) { + $skin_options[$option_name]['Value'] = $change_to; + } + } + + if ($can_change) { + $skin->SetDBField('Options', serialize($skin_options)); + $skin->Update(); + + $skin_eh =& $this->Application->recallObject('skin_EventHandler'); + /* @var $skin_eh SkinEventHandler */ + + $skin_eh->Compile($skin); + } + } + + } + } + } \ No newline at end of file