summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-27Merge pull request #4821 from loga4/redis-cacheAndrey Andreev1-1/+7
Cache_redis: Select database index if provided
2016-09-27Add database index by defaultlogach1-1/+7
Select database if exists
2016-09-27Merge pull request #4810 from Dutchy-/patch-1Andrey Andreev1-1/+1
Remove inline style from form_open() hidden fields
2016-09-27Remove inline styles from hidden form inputEdwin Smulders1-1/+1
This change fixes console errors when using a CSP header that disables inline styles.
2016-09-12Merge pull request #4806 from hex-ci/patch-1Andrey Andreev1-2/+2
[ci skip] Fix formatting in 2.1.0 upgrade instructions
2016-09-12Fix small doc problem.Hex1-2/+2
2016-09-09Merge pull request #4805 from intekhabrizvi/developAndrey Andreev1-1/+1
Use MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT as a connection flag instead of option
2016-09-09Removed mysqli options function for ssl certificate verification falseintekhab1-1/+0
2016-09-09supplied flag to turn off mysqli SSL verification if ssl_verify passed as falseintekhab1-0/+1
2016-08-30Merge pull request #4788 from edtsz/patch-2Andrey Andreev1-1/+17
Add OpenOffice mime-types to config/mimes.php
2016-08-30OpenOffice mime-typesÉderson T. Szlachta1-1/+17
According to IANA media types : http://www.iana.org/assignments/media-types/media-types.xhtml
2016-08-29Merge pull request #4785 from guitarrist/developAndrey Andreev1-1/+1
[ci skip] Fix a comment typo
2016-08-26fix typoAntônio1-1/+1
2016-08-23Merge pull request #4781 from tianhe1986/develop_hash_pbkdf2Andrey Andreev1-1/+1
Hash: processing algorithm name case-insensitively in hash_pbkdf2()
2016-08-23Move strtolower() inside the is_array() check,tianhe19861-2/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-23Hash: processing algorithm name case-insensitively in hash_pbkdf2():tianhe19861-0/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-22Merge pull request #4780 from tianhe1986/develop_standard_hex2binAndrey Andreev1-1/+1
[ci skip] Trigger error for "resource" type in hex2bin() inputs
2016-08-22Standard: filtering "resource" type in hex2bin()tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-22Merge branch '3.1-stable' into developAndrey Andreev4-5/+38
2016-08-22Skip mcrypt-related testcases on PHP 7.1Andrey Andreev2-2/+14
ext/mcrypt is deprecated and the test cases in question trigger E_DEPRECATED messages as a result.
2016-08-22Fix CI_Upload errors on PHP 7.1Andrey Andreev2-3/+21
2016-08-22Merge pull request #4778 from antydemant/patch-1Andrey Andreev1-2/+2
[ci skip] Docblock return type corrections
2016-08-22Merge pull request #4778 from antydemant/patch-1Andrey Andreev1-2/+2
[ci skip] Docblock return type corrections
2016-08-21return fixIgor Ostapchuk1-2/+2
2016-08-19Travis builds on PHP 7.1 (beta)Andrey Andreev1-2/+6
2016-08-19Travis builds on PHP 7.1 (beta)Andrey Andreev1-6/+6
2016-08-19[ci skip] Add changelog entry for PR #4777Andrey Andreev1-0/+2
2016-08-19Merge pull request #4777 from tianhe1986/develop_error_handlerAndrey Andreev1-1/+1
Add E_PARSE to errors detected by shutdown handler
2016-08-19Merge pull request #4777 from tianhe1986/develop_error_handlerAndrey Andreev1-1/+1
Add E_PARSE to errors detected by shutdown handler
2016-08-19Common: Adding E_PARSE in error judgment.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-11Merge pull request #4764 from butane/uri_scheme_caseAndrey Andreev3-9/+4
URI schemes are not case-sensitive
2016-08-11Removed useless checksVivek Dinesh2-7/+2
Based on GitHub discussion. Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-11[ci skip] Add changelog entry for #4762Andrey Andreev1-0/+1
2016-08-11Merge pull request #4762 from tianhe1986/develop_cache_file_metadataAndrey Andreev1-2/+2
Cache_file: use $data['time'] for calculating expired time.
2016-08-11Merge pull request #4762 from tianhe1986/develop_cache_file_metadataAndrey Andreev1-2/+2
Cache_file: use $data['time'] for calculating expired time.
2016-08-11Using "! isset($a, $b, ……)" instead of "! isset($a) OR ! isset($b) OR ↵tianhe19861-1/+1
……" Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-11URI schemes are not case-sensitiveVivek Dinesh3-5/+5
Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-11Checking for $data['time'].tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-11Merge pull request #4761 from tianhe1986/develop_cache_file_checkAndrey Andreev1-2/+2
Cache_file: use is_file() for checking instead of file_exists().
2016-08-11Merge pull request #4761 from tianhe1986/develop_cache_file_checkAndrey Andreev1-2/+2
Cache_file: use is_file() for checking instead of file_exists().
2016-08-11Cache_file: use $data['time'] for calculating expired time.tianhe19861-1/+1
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-11Cache_file: use is_file() for checking instead of file_exists().tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2016-08-10Merge branch '3.1-stable' into developAndrey Andreev36-678/+88
2016-08-10Add changelog entry and a test case for #4758Andrey Andreev2-0/+4
2016-08-10Merge pull request #4758 from butane/uri_scheme_caseAndrey Andreev3-3/+3
URI schemes are not case-sensitive
2016-08-10Merge pull request #4758 from butane/uri_scheme_caseAndrey Andreev3-3/+3
URI schemes are not case-sensitive
2016-08-10Use getMockBuilder() in PHPUnit instead of the deprecated getMock()Andrey Andreev8-17/+17
2016-08-10Better usageVivek Dinesh2-2/+2
Based on GitHub discussion. Signed-off-by: Vivek Dinesh <vivekdinesh5@gmail.com>
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
CI_Unit_test: Do not replace "is_double" with "is_float".
2016-08-10Merge pull request #4755 from tianhe1986/develop_not_replace_is_doubleAndrey Andreev1-1/+0
CI_Unit_test: Do not replace "is_double" with "is_float".