[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6124-ga8852c5

The branch, master has been updated via a8852c5dc9afd08a3bf00eea4273aef1bca6316e (commit) from 5675555d5a67800ca86888a733bd050175bc975f (commit) - Log ----------------------------------------------------------------- commit a8852c5dc9afd08a3bf00eea4273aef1bca6316e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 3 13:10:31 2010 -0400 JSON exported file extension should be .json ----------------------------------------------------------------------- Summary of changes: libraries/export/json.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/export/json.php b/libraries/export/json.php index 0355d9a..5a09265 100644 --- a/libraries/export/json.php +++ b/libraries/export/json.php @@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['json'] = array( 'text' => 'JSON', - 'extension' => 'php', + 'extension' => 'json', 'mime_type' => 'text/plain', 'options' => array( array( hooks/post-receive -- phpMyAdmin