Skip to content

Commit 1573624

Browse files
authored
Merge pull request #183 from contactashish13/undo-non-latin-change
Fixed non-latin chars render.
2 parents ed190bc + bd70925 commit 1573624

File tree

8 files changed

+11
-14
lines changed

8 files changed

+11
-14
lines changed

classes/Visualizer/Module/Chart.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,8 @@ public function exportData() {
539539
}
540540
}
541541
$fp = tmpfile();
542+
// support for MS Excel
543+
fprintf( $fp, $bom = ( chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF ) ) );
542544
foreach ( $rows as $row ) {
543545
fputcsv( $fp, $row );
544546
}

classes/Visualizer/Plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
class Visualizer_Plugin {
2929

3030
const NAME = 'visualizer';
31-
const VERSION = '2.1.5';
31+
const VERSION = '2.1.6';
3232

3333
// custom post types
3434
const CPT_VISUALIZER = 'visualizer';

classes/Visualizer/Source/Csv.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public function __construct( $filename = null ) {
6262
private function _fetchSeries( &$handle ) {
6363
// read column titles
6464
$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
65-
$labels = array_map( 'utf8_encode', $labels );
6665
// read series types
6766
$types = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
6867

@@ -79,7 +78,6 @@ private function _fetchSeries( &$handle ) {
7978

8079
// re read the labels and empty types array
8180
$labels = fgetcsv( $handle, 0, VISUALIZER_CSV_DELIMITER, VISUALIZER_CSV_ENCLOSURE );
82-
$labels = array_map( 'utf8_encode', $labels );
8381
$types = array();
8482
}
8583

@@ -107,10 +105,7 @@ protected function _get_file_handle( $filename = false ) {
107105
// set line endings auto detect mode
108106
ini_set( 'auto_detect_line_endings', true );
109107
// open file and return handle
110-
$fc = iconv( 'ISO-8859-1', 'utf-8', file_get_contents( $filename ? $filename : $this->_filename ) );
111-
$tmp = tempnam( sys_get_temp_dir(), rand() );
112-
file_put_contents( $tmp, $fc );
113-
return fopen( $tmp, 'rb' );
108+
return fopen( $filename ? $filename : $this->_filename, 'rb' );
114109
}
115110

116111
/**

css/media.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Version: 2.1.5
2+
Version: 2.1.6
33
*/
44
#visualizer-library-view {
55
padding: 30px 10px 10px 30px;

index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Plugin Name: Visualizer: Charts and Graphs Lite
55
Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/
66
Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases.
7-
Version: 2.1.5
7+
Version: 2.1.6
88
Author: Themeisle
99
Author URI: http://themeisle.com
1010
License: GPL v2.0 or later

languages/visualizer.pot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# This file is distributed under the GPL v2.0 or later.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Visualizer: Charts and Graphs Lite 2.1.3\n"
5+
"Project-Id-Version: Visualizer: Charts and Graphs Lite 2.1.5\n"
66
"Report-Msgid-Bugs-To: https://github.com/Codeinwp/visualizer/issues\n"
7-
"POT-Creation-Date: 2017-06-01 12:45:19+00:00\n"
7+
"POT-Creation-Date: 2017-06-07 18:40:31+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +102,7 @@ msgid "Pro Addon"
102102
msgstr ""
103103

104104
#: classes/Visualizer/Module/Chart.php:298
105-
#: classes/Visualizer/Module/Chart.php:579
105+
#: classes/Visualizer/Module/Chart.php:581
106106
msgid "You have entered invalid URL. Please, insert proper URL."
107107
msgstr ""
108108

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "visualizer",
3-
"version": "2.1.5",
3+
"version": "2.1.6",
44
"description": "Visualizer Lite",
55
"repository": {
66
"type": "git",

readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
=== WordPress Charts and Graphs Lite ===
2-
Contributors: codeinwp,marius2012,marius_codeinwp,hardeepasrani,themeisle,Madalin_ThemeIsle
2+
Contributors: codeinwp,marius2012,marius_codeinwp,hardeepasrani,themeisle,Madalin_ThemeIsle,rozroz
33
Tags: chart, charts, charting, graph, graphs, graphing, visualisation, visualise data, visualization, visualize data, HTML5, canvas, pie chart, line chart, bar chart, column chart, gauge chart, area chart, scatter chart, candlestick chart, geo chart, google visualization api
44
Requires at least: 3.5
55
Tested up to: 4.7.5

0 commit comments

Comments
 (0)