diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-01 12:03:24 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-01 12:03:24 -0500 |
| commit | f08330f7620f16ed6a127768a74ef6748bcb972c (patch) | |
| tree | 830f92f229f243092e1dd61429ee843509e79951 /phpBB/adm/style | |
| parent | 8c75d1c1bc494220bed313e542902cdc22c5336f (diff) | |
| parent | 8233c3e340a3608a6952ef444143a10e668d6561 (diff) | |
| download | forums-f08330f7620f16ed6a127768a74ef6748bcb972c.tar forums-f08330f7620f16ed6a127768a74ef6748bcb972c.tar.gz forums-f08330f7620f16ed6a127768a74ef6748bcb972c.tar.bz2 forums-f08330f7620f16ed6a127768a74ef6748bcb972c.tar.xz forums-f08330f7620f16ed6a127768a74ef6748bcb972c.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Dhruv (7) and others
# Via Andreas Fischer (7) and others
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11593] initialize $is_expr as null before being passed to get_varref
[ticket/9341] Assert that page doesnt contain next or prev page posts
[ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
[ticket/9341] remove PREV_PAGE tpl var used for backward compatability
[ticket/11618] Replace glob() with scandir() and string matching
[ticket/9341] Add tests for checking Next and Previous template vars
[ticket/9341] Move create_topic and post into functional test case
[ticket/11615] Fix typo in creation_test
[ticket/11615] Remove magic number in creation_test
[ticket/11615] Rename class in file to match
[ticket/11615] Rename init_test to creation_test for clarity
[ticket/9341] Use U_PREVIOUS and U_NEXT in template files
[ticket/9341] Correctly named template vars
Conflicts:
tests/template/template_test_case.php
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_icons.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 373a7b890c..eca02d2798 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -243,8 +243,8 @@ <td style="text-align: center;">{items.EMOTION}</td> <!-- ENDIF --> <td style="text-align: right; white-space: nowrap;"> - <!-- IF items.S_FIRST_ROW and not PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF --> - <!-- IF items.S_LAST_ROW and not NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF --> + <!-- IF items.S_FIRST_ROW and not U_PREVIOUS_PAGE -->{ICON_MOVE_UP_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_UP}">{ICON_MOVE_UP}</a><!-- ENDIF --> + <!-- IF items.S_LAST_ROW and not U_NEXT_PAGE -->{ICON_MOVE_DOWN_DISABLED}<!-- ELSE --><a href="{items.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a><!-- ENDIF --> <a href="{items.U_EDIT}">{ICON_EDIT}</a> <a href="{items.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a> </td> </tr> |