Merge branch 'master' of github.com:mantisbt/mantisbt into maturbet-d…

…isableoptionproject

.travis.yml

@@ -17,10 +17,10 @@ before_install:
   - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0', '>=' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar && chmod +x ~/bin/phpunit; fi
 
 before_script:
-  - ./build-scripts/travis_before_script.sh
+  - ./build/travis_before_script.sh
 
 script:
-  - ./build-scripts/travis_script.sh
+  - ./build/travis_script.sh
 
 # -----------------------------------------------------------------------------
 # What to build, and on which platforms

admin/check/check_php_inc.php

@@ -51,7 +51,8 @@
 	'pcre',
 	'Reflection',
 	'session',
-	'mbstring'
+	'mbstring',
+	'json'
 );
 
 foreach( $t_extensions_required as $t_extension ) {
@@ -115,18 +116,6 @@
 	array( false => 'The value of this directive is currently: ' . $t_variables_order )
 );
 
-check_print_test_row(
-	'magic_quotes_gpc php.ini directive is disabled',
-	!( function_exists( 'get_magic_quotes_gpc' ) && @get_magic_quotes_gpc() ),
-	array( false => 'PHP\'s magic quotes feature is <a href="http://www.php.net/manual/en/security.magicquotes.whynot.php">deprecated in PHP 5.3.0</a> and should not be used.' )
-);
-
-check_print_test_row(
-	'magic_quotes_runtime php.ini directive is disabled',
-	!( function_exists( 'get_magic_quotes_runtime' ) && @get_magic_quotes_runtime() ),
-	array( false => 'PHP\'s magic quotes feature is <a href="http://www.php.net/manual/en/security.magicquotes.whynot.php">deprecated in PHP 5.3.0</a> and should not be used.' )
-);
-
 check_print_test_warn_row(
 	'register_argc_argv php.ini directive is disabled',
 	!ini_get_bool( 'register_argc_argv' ),