[Phpmyadmin-git] [phpmyadmin/phpmyadmin] aa1295: Fix bug #3571970 for master

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: aa12956816f857e22d67e327cfd01afa0d8147e8
      https://github.com/phpmyadmin/phpmyadmin/commit/aa12956816f857e22d67e327cfd01afa0d8147e8
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2012-10-28 (Sun, 28 Oct 2012)

  Changed paths:
    M ChangeLog
    M js/tbl_chart.js
    M tbl_chart.php

  Log Message:
  -----------
  Fix bug #3571970 for master


  Commit: 0026d89bf2e1697ee84d6293df7d1737bdc501d3
      https://github.com/phpmyadmin/phpmyadmin/commit/0026d89bf2e1697ee84d6293df7d1737bdc501d3
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2012-10-28 (Sun, 28 Oct 2012)

  Changed paths:
    M db_datadict.php
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/File.class.php
    M libraries/PDF.class.php
    M libraries/RecentTable.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/plugins/export/ExportCodegen.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportExcel.class.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportJson.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportMediawiki.class.php
    M libraries/plugins/export/ExportOds.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/export/ExportPdf.class.php
    M libraries/plugins/export/ExportPhparray.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/export/ExportYaml.class.php
    M libraries/plugins/export/PMA_ExportPdf.class.php
    M libraries/plugins/export/TableProperty.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/import/ImportXml.class.php
    M libraries/plugins/transformations/Application_Octetstream_Download.class.php
    M libraries/plugins/transformations/Application_Octetstream_Hex.class.php
    M libraries/plugins/transformations/Image_JPEG_Inline.class.php
    M libraries/plugins/transformations/Image_JPEG_Link.class.php
    M libraries/plugins/transformations/Image_PNG_Inline.class.php
    M libraries/plugins/transformations/Text_Plain_Append.class.php
    M libraries/plugins/transformations/Text_Plain_Dateformat.class.php
    M libraries/plugins/transformations/Text_Plain_External.class.php
    M libraries/plugins/transformations/Text_Plain_Formatted.class.php
    M libraries/plugins/transformations/Text_Plain_Imagelink.class.php
    M libraries/plugins/transformations/Text_Plain_Link.class.php
    M libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php
    M libraries/plugins/transformations/Text_Plain_Sql.class.php
    M libraries/plugins/transformations/Text_Plain_Substring.class.php
    M libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php
    M libraries/rte/rte_events.lib.php
    M libraries/user_preferences.lib.php
    M po/si.po
    M prefs_forms.php
    M prefs_manage.php
    M server_status.php
    M tbl_relation.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a245ad47d685...0026d89bf2e1