| Index: trunk/extensions/timeline/Timeline.php |
| — | — | @@ -64,7 +64,8 @@ |
| 65 | 65 | global $wgUploadDirectory, $wgUploadPath, $wgArticlePath, $wgTmpDirectory, $wgRenderHashAppend; |
| 66 | 66 | global $wgTimelineSettings; |
| 67 | 67 | |
| 68 | | - $svg2png = ( $args['method'] == 'svg2png' ); |
| | 68 | + $method = isset( $args['method'] ) ? $args['method'] : 'ploticusOnly'; |
| | 69 | + $svg2png = ( $method == 'svg2png' ); |
| 69 | 70 | |
| 70 | 71 | // Get the backend to store plot data and pngs |
| 71 | 72 | if ( $wgTimelineSettings->fileBackend != '' ) { |
| — | — | @@ -112,8 +113,10 @@ |
| 113 | 114 | // map, and rendering (png or gif) file under the same dir as the temp file. |
| 114 | 115 | $cmdline = wfEscapeShellArg( $wgTimelineSettings->perlCommand, $wgTimelineSettings->timelineFile ) . |
| 115 | 116 | ($svg2png ? " -s " : "") . |
| 116 | | - " -i " . wfEscapeShellArg( $tmpPath ) . " -m -P " . wfEscapeShellArg( $wgTimelineSettings->ploticusCommand ) . |
| 117 | | - " -T " . wfEscapeShellArg( $wgTmpDirectory ) . " -A " . wfEscapeShellArg( $wgArticlePath ) . |
| | 117 | + " -i " . wfEscapeShellArg( $tmpPath ) . |
| | 118 | + " -m -P " . wfEscapeShellArg( $wgTimelineSettings->ploticusCommand ) . |
| | 119 | + " -T " . wfEscapeShellArg( $wgTmpDirectory ) . |
| | 120 | + " -A " . wfEscapeShellArg( $wgArticlePath ) . |
| 118 | 121 | " -f " . wfEscapeShellArg( $wgTimelineSettings->fontFile ); |
| 119 | 122 | |
| 120 | 123 | // Actually run the command... |