1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
This commit is contained in:
Nils Adermann
2013-09-16 01:24:05 +02:00
330 changed files with 10287 additions and 6367 deletions

View File

@@ -0,0 +1,71 @@
<?php
/**
*
* @package migration
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
*
*/
class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
{
public function effectively_installed()
{
return $this->db_tools->sql_table_exists($this->table_prefix . 'auth_provider_oauth');
}
public function update_schema()
{
return array(
'add_tables' => array(
$this->table_prefix . 'oauth_tokens' => array(
'COLUMNS' => array(
'user_id' => array('UINT', 0), // phpbb_users.user_id
'session_id' => array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
'provider' => array('VCHAR', ''), // Name of the OAuth provider
'oauth_token' => array('MTEXT', ''), // Serialized token
),
'KEYS' => array(
'user_id' => array('INDEX', 'user_id'),
'provider' => array('INDEX', 'provider'),
),
),
$this->table_prefix . 'oauth_accounts' => array(
'COLUMNS' => array(
'user_id' => array('UINT', 0),
'provider' => array('VCHAR', ''),
'oauth_provider_id' => array('TEXT_UNI', ''),
),
'PRIMARY_KEY' => array(
'user_id',
'provider',
),
),
),
);
}
public function revert_schema()
{
return array(
'drop_tables' => array(
$this->table_prefix . 'oauth_tokens',
$this->table_prefix . 'oauth_accounts',
),
);
}
public function update_data()
{
return array(
array('module.add', array(
'ucp',
'UCP_PROFILE',
array(
'module_basename' => 'ucp_auth_link',
'modes' => array('auth_link'),
),
)),
);
}
}

View File

@@ -0,0 +1,25 @@
<?php
/**
*
* @package migration
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
*
*/
class phpbb_db_migration_data_310_mod_rewrite extends phpbb_db_migration
{
static public function depends_on()
{
return array(
'phpbb_db_migration_data_310_dev',
);
}
public function update_data()
{
return array(
array('config.add', array('enable_mod_rewrite', '0')),
);
}
}

View File

@@ -0,0 +1,25 @@
<?php
/**
*
* @package migration
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
class phpbb_db_migration_data_310_notifications_cron extends phpbb_db_migration
{
static public function depends_on()
{
return array('phpbb_db_migration_data_310_notifications');
}
public function update_data()
{
return array(
array('config.add', array('read_notification_expire_days', 30)),
array('config.add', array('read_notification_last_gc', 0)), // last run
array('config.add', array('read_notification_gc', (60 * 60 * 24))), // seconds between run; 1 day
);
}
}

View File

@@ -0,0 +1,55 @@
<?php
/**
*
* @package migration
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
*
*/
class phpbb_db_migration_data_310_softdelete_mcp_modules extends phpbb_db_migration
{
public function effectively_installed()
{
$sql = 'SELECT module_id
FROM ' . MODULES_TABLE . "
WHERE module_class = 'mcp'
AND module_basename = 'mcp_queue'
AND module_mode = 'deleted_topics'";
$result = $this->db->sql_query($sql);
$module_id = $this->db->sql_fetchfield('module_id');
$this->db->sql_freeresult($result);
return $module_id !== false;
}
static public function depends_on()
{
return array(
'phpbb_db_migration_data_310_dev',
'phpbb_db_migration_data_310_softdelete_p2',
);
}
public function update_data()
{
return array(
array('module.add', array(
'mcp',
'MCP_QUEUE',
array(
'module_basename' => 'mcp_queue',
'modes' => array('deleted_topics'),
),
)),
array('module.add', array(
'mcp',
'MCP_QUEUE',
array(
'module_basename' => 'mcp_queue',
'modes' => array('deleted_posts'),
),
)),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.1', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_10 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.10', '>=');
return phpbb_version_compare($this->config['version'], '3.0.10', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_10_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.10-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.10-RC1', '>=');
}
static public function depends_on()
@@ -26,7 +26,7 @@ class release_3_0_10_rc1 extends \phpbb\db\migration\migration
return array(
array('config.add', array('email_max_chunk_size', 50)),
array('config.update', array('version', '3.0.10-rc1')),
array('config.update', array('version', '3.0.10-RC1')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_10_rc2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.10-rc2', '>=');
return phpbb_version_compare($this->config['version'], '3.0.10-RC2', '>=');
}
static public function depends_on()
@@ -24,7 +24,7 @@ class release_3_0_10_rc2 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.10-rc2')),
array('config.update', array('version', '3.0.10-RC2')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_10_rc3 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.10-rc3', '>=');
return phpbb_version_compare($this->config['version'], '3.0.10-RC3', '>=');
}
static public function depends_on()
@@ -24,7 +24,7 @@ class release_3_0_10_rc3 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.10-rc3')),
array('config.update', array('version', '3.0.10-RC3')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_11 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.11', '>=');
return phpbb_version_compare($this->config['version'], '3.0.11', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_11_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.11-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.11-RC1', '>=');
}
static public function depends_on()
@@ -27,7 +27,7 @@ class release_3_0_11_rc1 extends \phpbb\db\migration\migration
array('custom', array(array(&$this, 'cleanup_deactivated_styles'))),
array('custom', array(array(&$this, 'delete_orphan_private_messages'))),
array('config.update', array('version', '3.0.11-rc1')),
array('config.update', array('version', '3.0.11-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_11_rc2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.11-rc2', '>=');
return phpbb_version_compare($this->config['version'], '3.0.11-RC2', '>=');
}
static public function depends_on()
@@ -46,7 +46,7 @@ class release_3_0_11_rc2 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.11-rc2')),
array('config.update', array('version', '3.0.11-RC2')),
);
}
}

View File

@@ -15,7 +15,7 @@ class release_3_0_12_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.12-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.12-RC1', '>=');
}
static public function depends_on()
@@ -30,7 +30,7 @@ class release_3_0_12_rc1 extends \phpbb\db\migration\migration
array('custom', array(array(&$this, 'update_bots'))),
array('custom', array(array(&$this, 'disable_bots_from_receiving_pms'))),
array('config.update', array('version', '3.0.12-rc1')),
array('config.update', array('version', '3.0.12-RC1')),
);
}
@@ -110,7 +110,7 @@ class release_3_0_12_rc1 extends \phpbb\db\migration\migration
WHERE user_id = $bot_user_id";
$this->sql_query($sql);
user_delete('remove', $bot_user_id);
user_delete('retain', $bot_user_id);
}
else
{

View File

@@ -13,7 +13,7 @@ class release_3_0_1_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.1-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.1-RC1', '>=');
}
public function update_schema()
@@ -76,7 +76,7 @@ class release_3_0_1_rc1 extends \phpbb\db\migration\migration
array('custom', array(array(&$this, 'fix_unset_last_view_time'))),
array('custom', array(array(&$this, 'reset_smiley_size'))),
array('config.update', array('version', '3.0.1-rc1')),
array('config.update', array('version', '3.0.1-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.2', '>=');
return phpbb_version_compare($this->config['version'], '3.0.2', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_2_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.2-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.2-RC1', '>=');
}
static public function depends_on()
@@ -28,7 +28,7 @@ class release_3_0_2_rc1 extends \phpbb\db\migration\migration
array('config.add', array('check_attachment_content', '1')),
array('config.add', array('mime_triggers', 'body|head|html|img|plaintext|a href|pre|script|table|title')),
array('config.update', array('version', '3.0.2-rc1')),
array('config.update', array('version', '3.0.2-RC1')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_2_rc2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.2-rc2', '>=');
return phpbb_version_compare($this->config['version'], '3.0.2-RC2', '>=');
}
static public function depends_on()
@@ -76,7 +76,7 @@ class release_3_0_2_rc2 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.2-rc2')),
array('config.update', array('version', '3.0.2-RC2')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_3 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.3', '>=');
return phpbb_version_compare($this->config['version'], '3.0.3', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_3_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.3-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.3-RC1', '>=');
}
static public function depends_on()
@@ -62,7 +62,7 @@ class release_3_0_3_rc1 extends \phpbb\db\migration\migration
array('permission.add', array('u_masspm_group', true, 'u_masspm')),
array('custom', array(array(&$this, 'correct_acp_email_permissions'))),
array('config.update', array('version', '3.0.3-rc1')),
array('config.update', array('version', '3.0.3-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_4 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.4', '>=');
return phpbb_version_compare($this->config['version'], '3.0.4', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_4_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.4-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.4-RC1', '>=');
}
static public function depends_on()
@@ -78,7 +78,7 @@ class release_3_0_4_rc1 extends \phpbb\db\migration\migration
return array(
array('custom', array(array(&$this, 'update_custom_profile_fields'))),
array('config.update', array('version', '3.0.4-rc1')),
array('config.update', array('version', '3.0.4-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_5 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.5', '>=');
return phpbb_version_compare($this->config['version'], '3.0.5', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.5-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.5-RC1', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_5_rc1part2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.5-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.5-RC1', '>=');
}
static public function depends_on()
@@ -38,7 +38,7 @@ class release_3_0_5_rc1part2 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.5-rc1')),
array('config.update', array('version', '3.0.5-RC1')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_6 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.6', '>=');
return phpbb_version_compare($this->config['version'], '3.0.6', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.6-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.6-RC1', '>=');
}
static public function depends_on()
@@ -187,7 +187,7 @@ class release_3_0_6_rc1 extends \phpbb\db\migration\migration
array('custom', array(array(&$this, 'add_newly_registered_group'))),
array('custom', array(array(&$this, 'set_user_options_default'))),
array('config.update', array('version', '3.0.6-rc1')),
array('config.update', array('version', '3.0.6-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_6_rc2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.6-rc2', '>=');
return phpbb_version_compare($this->config['version'], '3.0.6-RC2', '>=');
}
static public function depends_on()
@@ -24,7 +24,7 @@ class release_3_0_6_rc2 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.6-rc2')),
array('config.update', array('version', '3.0.6-RC2')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_6_rc3 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.6-rc3', '>=');
return phpbb_version_compare($this->config['version'], '3.0.6-RC3', '>=');
}
static public function depends_on()
@@ -26,7 +26,7 @@ class release_3_0_6_rc3 extends \phpbb\db\migration\migration
return array(
array('custom', array(array(&$this, 'update_cp_fields'))),
array('config.update', array('version', '3.0.6-rc3')),
array('config.update', array('version', '3.0.6-RC3')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_6_rc4 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.6-rc4', '>=');
return phpbb_version_compare($this->config['version'], '3.0.6-RC4', '>=');
}
static public function depends_on()
@@ -24,7 +24,7 @@ class release_3_0_6_rc4 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.6-rc4')),
array('config.update', array('version', '3.0.6-RC4')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_7 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.7', '>=');
return phpbb_version_compare($this->config['version'], '3.0.7', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_7_pl1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.7-pl1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.7-pl1', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_7_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.7-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.7-RC1', '>=');
}
static public function depends_on()
@@ -64,7 +64,7 @@ class release_3_0_7_rc1 extends \phpbb\db\migration\migration
array('config.add', array('feed_topics_active', $this->config['feed_overall_topics'])),
array('custom', array(array(&$this, 'delete_text_templates'))),
array('config.update', array('version', '3.0.7-rc1')),
array('config.update', array('version', '3.0.7-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_7_rc2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.7-rc2', '>=');
return phpbb_version_compare($this->config['version'], '3.0.7-RC2', '>=');
}
static public function depends_on()
@@ -26,7 +26,7 @@ class release_3_0_7_rc2 extends \phpbb\db\migration\migration
return array(
array('custom', array(array(&$this, 'update_email_hash'))),
array('config.update', array('version', '3.0.7-rc2')),
array('config.update', array('version', '3.0.7-RC2')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_8 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.8', '>=');
return phpbb_version_compare($this->config['version'], '3.0.8', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_8_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.8-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.8-RC1', '>=');
}
static public function depends_on()
@@ -40,7 +40,7 @@ class release_3_0_8_rc1 extends \phpbb\db\migration\migration
array('config.update_if_equals', array(600, 'queue_interval', 60)),
array('config.update_if_equals', array(50, 'email_package_size', 20)),
array('config.update', array('version', '3.0.8-rc1')),
array('config.update', array('version', '3.0.8-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_9 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.9', '>=');
return phpbb_version_compare($this->config['version'], '3.0.9', '>=');
}
static public function depends_on()

View File

@@ -13,7 +13,7 @@ class release_3_0_9_rc1 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.9-rc1', '>=');
return phpbb_version_compare($this->config['version'], '3.0.9-RC1', '>=');
}
static public function depends_on()
@@ -76,7 +76,7 @@ class release_3_0_9_rc1 extends \phpbb\db\migration\migration
array('custom', array(array(&$this, 'update_file_extension_group_names'))),
array('custom', array(array(&$this, 'fix_firebird_qa_captcha'))),
array('config.update', array('version', '3.0.9-rc1')),
array('config.update', array('version', '3.0.9-RC1')),
);
}

View File

@@ -13,7 +13,7 @@ class release_3_0_9_rc2 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.9-rc2', '>=');
return phpbb_version_compare($this->config['version'], '3.0.9-RC2', '>=');
}
static public function depends_on()
@@ -24,7 +24,7 @@ class release_3_0_9_rc2 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.9-rc2')),
array('config.update', array('version', '3.0.9-RC2')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_9_rc3 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.9-rc3', '>=');
return phpbb_version_compare($this->config['version'], '3.0.9-RC3', '>=');
}
static public function depends_on()
@@ -24,7 +24,7 @@ class release_3_0_9_rc3 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.9-rc3')),
array('config.update', array('version', '3.0.9-RC3')),
);
}
}

View File

@@ -13,7 +13,7 @@ class release_3_0_9_rc4 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return version_compare($this->config['version'], '3.0.9-rc4', '>=');
return phpbb_version_compare($this->config['version'], '3.0.9-RC4', '>=');
}
static public function depends_on()
@@ -24,7 +24,7 @@ class release_3_0_9_rc4 extends \phpbb\db\migration\migration
public function update_data()
{
return array(
array('config.update', array('version', '3.0.9-rc4')),
array('config.update', array('version', '3.0.9-RC4')),
);
}
}

View File

@@ -19,7 +19,7 @@ class signature_module_auth extends \phpbb\db\migration\migration
AND module_basename = 'ucp_profile'
AND module_mode = 'signature'";
$result = $this->db->sql_query($sql);
$module_auth = $this->db_sql_fetchfield('module_auth');
$module_auth = $this->db->sql_fetchfield('module_auth');
$this->db->sql_freeresult($result);
return $module_auth === 'acl_u_sig' || $module_auth === false;