{ICON_MOVE_UP_DISABLED}
- {ICON_MOVE_DOWN}
+ {ICON_MOVE_DOWN}
- {ICON_MOVE_UP}
- {ICON_MOVE_DOWN}
+ {ICON_MOVE_UP}
+ {ICON_MOVE_DOWN}
- {ICON_MOVE_UP}
+ {ICON_MOVE_UP}{ICON_MOVE_DOWN_DISABLED}{ICON_MOVE_UP_DISABLED}
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 12541cb057..a3a77df89b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -10,76 +10,98 @@ var img_templates = {
};
/**
- * The following callbacks are for reording forums in acp_forums. forum_down
- * is triggered when a forum is moved down, and forum_up is triggered when
- * a forum is moved up. It moves the row up or down, and deactivates /
+ * The following callbacks are for reording items. row_down
+ * is triggered when an item is moved down, and row_up is triggered when
+ * an item is moved up. It moves the row up or down, and deactivates /
* activates any up / down icons that require it (the ones at the top or bottom).
*/
-phpbb.add_ajax_callback('forum_down', function() {
+phpbb.add_ajax_callback('row_down', function() {
var el = $(this),
- tr = el.parents('tr');
+ tr = el.parents('tr'),
+ tr_swap = tr.next();
+ /*
+ * If the element was the first one, we have to:
+ * - Add the up-link to the row we moved
+ * - Remove the up-link on the next row
+ */
if (tr.is(':first-child'))
{
var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
- el.parents('span').siblings('.up').html(up_img);
-
- tr.next().find('.up').html(img_templates.up_disabled);
+ tr.find('.up').html(up_img);
phpbb.ajaxify({
- selector: el.parents('span').siblings('.up').children('a'),
- callback: 'forum_up',
+ selector: tr.find('.up').children('a'),
+ callback: 'row_up',
overlay: false
});
+
+ tr_swap.find('.up').html(img_templates.up_disabled);
}
- tr.insertAfter(tr.next());
+ tr.insertAfter(tr_swap);
+ /*
+ * As well as:
+ * - Remove the down-link on the moved row, if it is now the last row
+ * - Add the down-link to the next row, if it was the last row
+ */
if (tr.is(':last-child'))
{
- el.replaceWith(img_templates.down_disabled);
+ tr.find('.down').html(img_templates.down_disabled);
- var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
- tr.prev().find('.down').html(down_img);
+ var down_img = img_templates.down.clone().attr('href', tr_swap.attr('data-down'));
+ tr_swap.find('.down').html(down_img);
phpbb.ajaxify({
- selector: tr.prev().find('.down').children('a'),
- callback: 'forum_down',
+ selector: tr_swap.find('.down').children('a'),
+ callback: 'row_down',
overlay: false
});
}
});
-phpbb.add_ajax_callback('forum_up', function() {
+phpbb.add_ajax_callback('row_up', function() {
var el = $(this),
- tr = el.parents('tr');
+ tr = el.parents('tr'),
+ tr_swap = tr.prev();
+ /*
+ * If the element was the last one, we have to:
+ * - Add the down-link to the row we moved
+ * - Remove the down-link on the next row
+ */
if (tr.is(':last-child'))
{
var down_img = img_templates.down.clone().attr('href', tr.attr('data-down'));
- el.parents('span').siblings('.down').html(down_img);
-
- tr.prev().find('.down').html(img_templates.down_disabled);
+ tr.find('.down').html(down_img);
phpbb.ajaxify({
- selector: el.parents('span').siblings('.down').children('a'),
- callback: 'forum_down',
+ selector: tr.find('.down').children('a'),
+ callback: 'row_down',
overlay: false
});
+
+ tr_swap.find('.down').html(img_templates.down_disabled);
}
- tr.insertBefore(tr.prev());
+ tr.insertBefore(tr_swap);
+ /*
+ * As well as:
+ * - Remove the up-link on the moved row, if it is now the first row
+ * - Add the up-link to the previous row, if it was the first row
+ */
if (tr.is(':first-child'))
{
- el.replaceWith(img_templates.up_disabled);
+ tr.find('.up').html(img_templates.up_disabled);
- var up_img = img_templates.up.clone().attr('href', tr.attr('data-up'));
- tr.next().find('.up').html(up_img);
+ var up_img = img_templates.up.clone().attr('href', tr_swap.attr('data-up'));
+ tr_swap.find('.up').html(up_img);
phpbb.ajaxify({
- selector: tr.next().find('.up').children('a'),
- callback: 'forum_up',
+ selector: tr_swap.find('.up').children('a'),
+ callback: 'row_up',
overlay: false
});
}
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 0e0d3b14fd..164c4a2f55 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -324,11 +324,7 @@
Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.
-<<<<<<< HEAD
-
This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.
-=======
-
This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 4.3.3 to 5.4.x without problem.
->>>>>>> develop-olympus
+
This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and Firebird. Versions of PHP used range from 5.3.x to 5.4.x without problem.
7.i. Notice on PHP security issues
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php
index b20c0064ea..32bdb1918a 100644
--- a/phpBB/includes/cache/driver/file.php
+++ b/phpBB/includes/cache/driver/file.php
@@ -214,7 +214,7 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
while (($entry = readdir($dir)) !== false)
{
- if (strpos($entry, 'container') !== 0 &&
+ if (strpos($entry, 'container_') !== 0 &&
strpos($entry, 'sql_') !== 0 &&
strpos($entry, 'data_') !== 0 &&
strpos($entry, 'ctpl_') !== 0 &&
diff --git a/phpBB/includes/cache/driver/memory.php b/phpBB/includes/cache/driver/memory.php
index 98ac02b161..1ea9a3e9e7 100644
--- a/phpBB/includes/cache/driver/memory.php
+++ b/phpBB/includes/cache/driver/memory.php
@@ -162,7 +162,7 @@ abstract class phpbb_cache_driver_memory extends phpbb_cache_driver_base
while (($entry = readdir($dir)) !== false)
{
- if (strpos($entry, 'container') !== 0 &&
+ if (strpos($entry, 'container_') !== 0 &&
strpos($entry, 'sql_') !== 0 &&
strpos($entry, 'data_') !== 0 &&
strpos($entry, 'ctpl_') !== 0 &&
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 1de1d9f7ea..8014574443 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -84,8 +84,13 @@ function phpbb_create_compiled_container(array $extensions, array $passes, $phpb
$tmp_container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
$tmp_container->compile();
+ // XXX stop writing to global $cache when
+ // http://tracker.phpbb.com/browse/PHPBB3-11203 is fixed
+ $GLOBALS['cache'] = $tmp_container->get('cache');
+ $installed_exts = $tmp_container->get('ext.manager')->all_enabled();
+
// Now pass the enabled extension paths into the ext compiler extension
- $extensions[] = new phpbb_di_extension_ext($tmp_container->get('ext.manager')->all_enabled());
+ $extensions[] = new phpbb_di_extension_ext($installed_exts);
// Create the final container to be compiled and cached
$container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext);
@@ -126,15 +131,12 @@ function phpbb_create_dumped_container(array $extensions, array $passes, $phpbb_
function phpbb_create_dumped_container_unless_debug(array $extensions, array $passes, $phpbb_root_path, $php_ext)
{
- if (defined('DEBUG')) {
- return phpbb_create_compiled_container($extensions, $passes, $phpbb_root_path, $php_ext);
- }
-
- return phpbb_create_dumped_container($extensions, $passes, $phpbb_root_path, $php_ext);
+ $container_factory = defined('DEBUG') ? 'phpbb_create_compiled_container' : 'phpbb_create_dumped_container';
+ return $container_factory($extensions, $passes, $phpbb_root_path, $php_ext);
}
function phpbb_container_filename($phpbb_root_path, $php_ext)
{
$filename = str_replace(array('/', '.'), array('slash', 'dot'), $phpbb_root_path);
- return $phpbb_root_path . 'cache/' . $filename . '_container.' . $php_ext;
+ return $phpbb_root_path . 'cache/container_' . $filename . '.' . $php_ext;
}
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 0060e83b15..ff234464dc 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -1,12 +1,12 @@
-