WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: in `wp_read_video|audio_metadata()`, set `GETID3_TEMP_DIR` to `get_temp_dir()` if it is not defined. This is a workaround for when `safe_mode` is enabled pre-PHP 5.3. 

Props chriscct7, tomsommer.
Fixes #26265.

Built from https://develop.svn.wordpress.org/trunk@34866


git-svn-id: http://core.svn.wordpress.org/trunk@34831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-10-06 14:14:25 +00:00
parent 1dcc6e1b51
commit ddbd67a22e
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-admin/includes/media.php
View File

@ -2969,13 +2969,19 @@ function wp_add_id3_tag_data( &$metadata, $data ) {
* @return array|bool Returns array of metadata, if found. * @return array|bool Returns array of metadata, if found.
*/ */
function wp_read_video_metadata( $file ) { function wp_read_video_metadata( $file ) {
if ( ! file_exists( $file ) ) if ( ! file_exists( $file ) ) {
return false; return false;
}
$metadata = array(); $metadata = array();
if ( ! class_exists( 'getID3', false ) ) if ( ! defined( 'GETID3_TEMP_DIR' ) ) {
define( 'GETID3_TEMP_DIR', get_temp_dir() );
}
if ( ! class_exists( 'getID3', false ) ) {
require( ABSPATH . WPINC . '/ID3/getid3.php' ); require( ABSPATH . WPINC . '/ID3/getid3.php' );
}
$id3 = new getID3(); $id3 = new getID3();
$data = $id3->analyze( $file ); $data = $id3->analyze( $file );
@ -3025,12 +3031,18 @@ function wp_read_video_metadata( $file ) {
* @return array|bool Returns array of metadata, if found. * @return array|bool Returns array of metadata, if found.
*/ */
function wp_read_audio_metadata( $file ) { function wp_read_audio_metadata( $file ) {
if ( ! file_exists( $file ) ) if ( ! file_exists( $file ) ) {
return false; return false;
}
$metadata = array(); $metadata = array();
if ( ! class_exists( 'getID3', false ) ) if ( ! defined( 'GETID3_TEMP_DIR' ) ) {
define( 'GETID3_TEMP_DIR', get_temp_dir() );
}
if ( ! class_exists( 'getID3', false ) ) {
require( ABSPATH . WPINC . '/ID3/getid3.php' ); require( ABSPATH . WPINC . '/ID3/getid3.php' );
}
$id3 = new getID3(); $id3 = new getID3();
$data = $id3->analyze( $file ); $data = $id3->analyze( $file );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34865'; $wp_version = '4.4-alpha-34866';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.