← All changes | classes/Visualizer/Module/Setup.php +39 -15 3.1.3 → 3.2.1 View file →

		@@ -153,9 +153,9 @@
153	153	if ( defined( 'TI_UNIT_TESTING' ) ) {
154	154	return;
155	155	}
156	156
157		- if ( $plugin == VISUALIZER_BASENAME ) {
	157	+ if ( $plugin === VISUALIZER_BASENAME ) {
158	158	wp_redirect( admin_url( 'upload.php?page=' . Visualizer_Plugin::NAME ) );
159	159	exit();
160	160	}
161	161	}
		@@ -191,28 +191,52 @@
191	191	}
192	192
193	193	// check if the source is correct.
194	194	$source = get_post_meta( $chart_id, Visualizer_Plugin::CF_SOURCE, true );
195		- if ( $source !== 'Visualizer_Source_Query' ) {
196		- return $chart;
197		- }
	195	+ $load_series = false;
	196	+ switch ( $source ) {
	197	+ case 'Visualizer_Source_Query':
	198	+ // check if its a live-data chart or a cached-data chart.
	199	+ if ( ! $force ) {
	200	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	201	+ if ( ! empty( $hours ) ) {
	202	+ // cached, bail!
	203	+ return $chart;
	204	+ }
	205	+ }
198	206
199		- // check if its a live-data chart or a cached-data chart.
200		- if ( ! $force ) {
201		- $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_SCHEDULE, true );
202		- if ( ! empty( $hours ) ) {
203		- // cached, bail!
	207	+ $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
	208	+ $source = new Visualizer_Source_Query( $params );
	209	+ $source->fetch( false );
	210	+ $load_series = true;
	211	+ break;
	212	+ case 'Visualizer_Source_Json':
	213	+ // check if its a live-data chart or a cached-data chart.
	214	+ if ( ! $force ) {
	215	+ $hours = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, true );
	216	+ if ( ! empty( $hours ) ) {
	217	+ // cached, bail!
	218	+ return $chart;
	219	+ }
	220	+ }
	221	+
	222	+ $url = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_URL, true );
	223	+ $root = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_ROOT, true );
	224	+ $paging = get_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_PAGING, true );
	225	+ $series = get_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, true );
	226	+ $source = new Visualizer_Source_Json( array( 'url' => $url, 'root' => $root, 'paging' => $paging ) );
	227	+ $source->refresh( $series );
	228	+ break;
	229	+ default:
204	230	return $chart;
205		- }
206	231	}
207	232
208		- $params = get_post_meta( $chart_id, Visualizer_Plugin::CF_DB_QUERY, true );
209		- $source = new Visualizer_Source_Query( $params );
210		- $source->fetch( false );
211		-
212	233	$error = $source->get_error();
213	234	if ( empty( $error ) ) {
214		- update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	235	+ add_filter( 'wp_revisions_to_keep', '__return_false' );
	236	+ if ( $load_series ) {
	237	+ update_post_meta( $chart_id, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
	238	+ }
215	239
216	240	wp_update_post(
217	241	array(
218	242	'ID' => $chart_id,