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/10411-2

Browse Source 
* 'develop' of https://github.com/phpbb/phpbb3: (204 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  [ticket/10103] Inline assignment is bad?
  [ticket/10103] $rv had too few characters.
  [ticket/10103] Correct flock class documentation.
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/includes/groupposition/legend.php
This commit is contained in:
Joas Schilling
2012-12-06 14:26:14 +01:00
parent 98092add9e 2364d4b217
commit b4db972840
132 changed files with 3089 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/adm/style/ajax.js
View File

@@ -36,7 +36,7 @@ phpbb.add_ajax_callback('row_down', function() {
overlay: false
});
tr_swap.find('.up').html(img_templates.up_disabled);
tr_swap.find('.up').html(img_templates.up_disabled.clone());
}
tr.insertAfter(tr_swap);
@@ -48,7 +48,7 @@ phpbb.add_ajax_callback('row_down', function() {
*/
if (tr.is(':last-child'))
{
tr.find('.down').html(img_templates.down_disabled);
tr.find('.down').html(img_templates.down_disabled.clone());
var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
tr_swap.find('.down').html(down_img);
@@ -82,7 +82,7 @@ phpbb.add_ajax_callback('row_up', function() {
overlay: false
});
tr_swap.find('.down').html(img_templates.down_disabled);
tr_swap.find('.down').html(img_templates.down_disabled.clone());
}
tr.insertBefore(tr_swap);
@@ -94,7 +94,7 @@ phpbb.add_ajax_callback('row_up', function() {
*/
if (tr.is(':first-child'))
{
tr.find('.up').html(img_templates.up_disabled);
tr.find('.up').html(img_templates.up_disabled.clone());
var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
tr_swap.find('.up').html(up_img);