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