← All changes | classes/Visualizer/Source/Csv/Remote.php +4 -7 3.10.0 → 3.0.2 View file →

		@@ -46,9 +46,9 @@
46	46	*
47	47	* @access public
48	48	* @return string The serialized array of data.
49	49	*/
50		- public function getData( $dumb = false ) {
	50	+ public function getData() {
51	51	return serialize(
52	52	array(
53	53	'source' => $this->_filename,
54	54	'data' => $this->_data,
		@@ -96,12 +96,9 @@
96	96	* @param int $chart_id The chart id.
97	97	* @return array The re populated array of data or old one.
98	98	*/
99	99	public function repopulateData( $data, $chart_id ) {
100		- if ( ! is_array( $data ) ) {
101		- $data = array();
102		- }
103		- return array_key_exists( 'data', $data ) ? $data['data'] : $data;
	100	+ return $this->_repopulate( $chart_id ) ? $this->_data : $data;
104	101	}
105	102
106	103	/**
107	104	* Re populates series.
		@@ -113,9 +110,9 @@
113	110	* @param int $chart_id The chart id.
114	111	* @return array The re populated array of series or old one.
115	112	*/
116	113	public function repopulateSeries( $series, $chart_id ) {
117		- return $series;
	114	+ return $this->_repopulate( $chart_id ) ? $this->_series : $series;
118	115	}
119	116
120	117	/**
121	118	* Returns source name.
		@@ -150,9 +147,9 @@
150	147	$allow_url_fopen = filter_var( ini_get( 'allow_url_fopen' ), FILTER_VALIDATE_BOOLEAN );
151	148	}
152	149
153	150	$scheme = parse_url( $this->_filename, PHP_URL_SCHEME );
154		- if ( $allow_url_fopen && in_array( $scheme, stream_get_wrappers(), true ) ) {
	151	+ if ( $allow_url_fopen && in_array( $scheme, stream_get_wrappers() ) ) {
155	152	return parent::_get_file_handle( $filename );
156	153	}
157	154
158	155	require_once ABSPATH . 'wp-admin/includes/file.php';