nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2010-10-14 12:40:30 +02:00
parent 08e23bad9d 2ecf4b3641
commit 9909fe1375
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation.html
View File

@@ -4828,6 +4828,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
<li>AJAXifying the interface</li>
</ul></li>
<li>Martynas Mickevičius (Google Summer of Code 2010)
<ul>
<li>Charts</li>
</ul></li>
<li>Barrie Leslie
<ul>
<li>BLOBstreaming support with PBMS PHP extension</li>

4
libraries/chart/pma_pchart_chart.php
View File

@@ -97,7 +97,7 @@ abstract class PMA_pChart_chart extends PMA_chart
$this->dataSet = new pData;
$this->chart->reportWarnings('GD');
$this->chart->ErrorFontName = $this->getFontPath().'tahoma.ttf';
$this->chart->ErrorFontName = $this->getFontPath().'DejaVuSans.ttf';
// initialize colors
foreach ($this->getColors() as $key => $color) {
@@ -109,7 +109,7 @@ abstract class PMA_pChart_chart extends PMA_chart
);
}
$this->chart->setFontProperties($this->getFontPath().'tahoma.ttf', $this->getFontSize());
$this->chart->setFontProperties($this->getFontPath().'DejaVuSans.ttf', $this->getFontSize());
$this->chart->setImageMap(true, 'mapid');
}