Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e52bbde39b46172e6f8535c66db2b0d924f94ad0 https://github.com/phpmyadmin/phpmyadmin/commit/e52bbde39b46172e6f8535c66db2... Author: jrchamp <jonathan_champ@ncsu.edu> Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- PMA_getRealSize - Performance and Readability The "upstream" Moodle code was updated in MDL-39524; rather than looping through the options, preg_match allows us to directly select the correct multiplication factor with a single function call. Note that the default behavior (integer coercion) handles both bare integers and numbers of bytes (factor 1). Signed-off-by: Jonathan Champ <jrchamp@ncsu.edu> Commit: 06d76588c2340475fbafd27cb4ce75050242513b https://github.com/phpmyadmin/phpmyadmin/commit/06d76588c2340475fbafd27cb4ce... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-13 (Tue, 13 Dec 2016) Changed paths: M libraries/core.lib.php Log Message: ----------- Merge pull request #12797 from jrchamp/patch-1 PMA_getRealSize - Performance and Readability Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a9bd6bebb2c9...06d76588c234