diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | phpBB/includes/bbcode.php | 5 | ||||
| -rwxr-xr-x | travis/install-phpunit-5-2.sh | 22 |
3 files changed, 29 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 330cce59b9..01e2553f3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_script: - sh -c "if [ '$DB' = 'mariadb' ]; then travis/setup-mariadb.sh; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysql' ]; then mysql -e 'SET GLOBAL storage_engine=MyISAM;'; fi" - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi" - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then travis/install-phpunit-5-2.sh; fi" - cd phpBB - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev --no-interaction --prefer-source; fi" - cd .. @@ -25,7 +25,7 @@ before_script: - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' ]; then sudo apt-get update; sudo apt-get install -y parallel libimage-exiftool-perl; fi" script: - - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-5-2-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then php -d include_path='.:phpunit' phpunit/phpunit.php --configuration travis/phpunit-$DB-5-2-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysql' ]; then find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' || exit 1; fi" diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index f587e111f3..3c25fd6587 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -135,6 +135,11 @@ class bbcode $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html'; + if (empty($user->theme['template_inherits_id']) && !empty($template->orig_tpl_inherits_id)) + { + $user->theme['template_inherits_id'] = $template->orig_tpl_inherits_id; + } + if (!@file_exists($this->template_filename)) { if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) diff --git a/travis/install-phpunit-5-2.sh b/travis/install-phpunit-5-2.sh new file mode 100755 index 0000000000..28f9069960 --- /dev/null +++ b/travis/install-phpunit-5-2.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# +# @copyright (c) 2015 phpBB Group +# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +# + +# $1 - URL to .tar.gz +download() { + wget -q -O - "$1" | tar xzvf - --strip-components 1 +} + +mkdir phpunit +cd phpunit +download https://github.com/sebastianbergmann/phpunit/archive/3.6.12.tar.gz +download https://github.com/sebastianbergmann/php-file-iterator/archive/1.3.1.tar.gz +download https://github.com/sebastianbergmann/php-code-coverage/archive/1.1.3.tar.gz +download https://github.com/sebastianbergmann/php-token-stream/archive/1.1.3.tar.gz +download https://github.com/sebastianbergmann/php-text-template/archive/1.1.2.tar.gz +download https://github.com/sebastianbergmann/php-timer/archive/1.0.2.tar.gz +download https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.1.1.tar.gz +download https://github.com/sebastianbergmann/dbunit/archive/1.1.2.tar.gz +cd .. |