mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314

Browse Source 
Conflicts:
	phpBB/styles/prosilver/template/timezone.js
This commit is contained in:
Marc Alexander
2013-03-26 13:18:54 +01:00
parent f0b0978538 8b464e87f0
commit 34cdbd0360
213 changed files with 15880 additions and 2836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/timezone.js
View File

@@ -15,7 +15,7 @@ $(document).ready(
);
$(document).ready(
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('data-is-registration') === 'true')
phpbb.timezonePreselectSelect($('#tz_select_date_suggest').attr('timezone-preselect') === 'true')
);
})(jQuery); // Avoid conflicts with other libraries