diff --git a/build/build.xml b/build/build.xml index e748aabdb7..92c3860192 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index aa982ddeca..cacd1835a0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -58,6 +58,7 @@
  • Changes since 3.2.0-a2
  • Changes since 3.2.0-a1
  • Changes since 3.1.x
    • +
  • Changes since 3.1.11
  • Changes since 3.1.10
  • Changes since 3.1.9
  • Changes since 3.1.8
    • @@ -850,6 +851,49 @@
  • [PHPBB3-14265] - Make all tables available in the container
    • +

    Changes since 3.1.11

    + +

    Bug

    +
      +
    • [PHPBB3-9533] - phpbb_own_realpath() doesn't always replicate realpath() behaviour
      • +
    • [PHPBB3-12835] - Jump-box dropdown menu doesn't expand with according to line length in IE8
      • +
    • [PHPBB3-13360] - rename_too_long_indexes migration never deleted the old unique index
      • +
    • [PHPBB3-13464] - problem with drop down options and Arabic letters in chrome
      • +
    • [PHPBB3-13574] - Last post not showing in "Active topics" when Prosilver goes responsive
      • +
    • [PHPBB3-15174] - Unable to purge cache (ext & acp)
      • +
    • [PHPBB3-15285] - Travis tests are failing due to trusty changes
      • +
    • [PHPBB3-15303] - Typo in memcached driver
      • +
    • [PHPBB3-15347] - Password updater in cron generates invalid postgres SQL
      • +
    • [PHPBB3-15367] - Sphinx search backend doesn't escape special characters
      • +
    +

    Improvement

    +
      +
    • [PHPBB3-10122] - [list=] - should support "none", along with CSS2 types
      • +
    • [PHPBB3-11063] - Change version check to SSL
      • +
    • [PHPBB3-14820] - Style Version Missing
      • +
    • [PHPBB3-14919] - Inconsistent use of globals vs class elements in acp_extensions
      • +
    • [PHPBB3-14927] - event core.user_add_modify_data
      • +
    • [PHPBB3-14944] - Add possibility to search for template loop indexes by key
      • +
    • [PHPBB3-14995] - Add ACP template events acp_ext_list_*_name_after
      • +
    +

    New Feature

    + +

    Sub-task

    +
      +
    • [PHPBB3-11182] - Ensure that template files use L_COLON instead of colons.
      • +
    • [PHPBB3-11676] - generate_text_for_storage on includes/acp/acp_users.php
      • +
    +

    Task

    +
      +
    • [PHPBB3-10758] - Improve Functional Test Code Coverage
      • +
    • [PHPBB3-10791] - Add a section for extensions to readme.html
      • +
    • [PHPBB3-10792] - Add a section for 3.0 to 3.1 upgrades to install.html
      • +
    • [PHPBB3-13874] - Add master to sami API docs
      • +
    +

    Changes since 3.1.10

    Bug

    diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 7eeb36595d..8a5d49358c 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -@define('PHPBB_VERSION', '3.2.3-dev'); +@define('PHPBB_VERSION', '3.2.2'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 1f92439c70..6075b8d589 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -279,7 +279,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.2'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); diff --git a/phpBB/phpbb/db/migration/data/v31x/v3112.php b/phpBB/phpbb/db/migration/data/v31x/v3112.php new file mode 100644 index 0000000000..0d75d35184 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v3112.php @@ -0,0 +1,36 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v3112 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return phpbb_version_compare($this->config['version'], '3.1.12', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v3111', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.12')), + ); + } +} diff --git a/phpBB/phpbb/profilefields/type/type_string_common.php b/phpBB/phpbb/profilefields/type/type_string_common.php index 2648d03930..f5e1992044 100644 --- a/phpBB/phpbb/profilefields/type/type_string_common.php +++ b/phpBB/phpbb/profilefields/type/type_string_common.php @@ -108,6 +108,7 @@ abstract class type_string_common extends type_base return null; } + $field_value = make_clickable($field_value); $field_value = censor_text($field_value); $field_value = bbcode_nl2br($field_value); return $field_value; diff --git a/phpBB/phpbb/profilefields/type/type_url.php b/phpBB/phpbb/profilefields/type/type_url.php index 7bdd60e19d..37815b66a5 100644 --- a/phpBB/phpbb/profilefields/type/type_url.php +++ b/phpBB/phpbb/profilefields/type/type_url.php @@ -82,8 +82,6 @@ class type_url extends type_string return null; } - $field_value = make_clickable($field_value); - return parent::get_profile_value($field_value, $field_data); } } diff --git a/tests/profilefields/type_string_test.php b/tests/profilefields/type_string_test.php index a5e1d89ef2..54bb406838 100644 --- a/tests/profilefields/type_string_test.php +++ b/tests/profilefields/type_string_test.php @@ -273,8 +273,8 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case array( 'http://foobar.com', array('field_show_novalue' => false), - 'http://foobar.com', - 'Field should output the given value but not make it clickable', + 'foobar.com', + 'Field should output the given value and make it clickable', ), array( 'javascript://foobar.com',