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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-01-26 00:22:13 +01:00
commit ba03c864e2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/DisplayResults.class.php
View File

@ -3870,7 +3870,7 @@ class PMA_DisplayResults
if (PMA_strlen($column) > $GLOBALS['cfg']['LimitChars']
&& ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT)
&& gettype($transformation_plugin) == "object"
&& ! strpos($transformation_plugin::getName(), 'Link') === true
&& ! strpos($transformation_plugin->getName(), 'Link') === true
) {
$column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars'])
. '...';
@ -5409,7 +5409,7 @@ class PMA_DisplayResults
$result .= ']';
if (gettype($transformation_plugin) == "object"
&& strpos($transformation_plugin::getMIMESubtype(), 'Octetstream')
&& strpos($transformation_plugin->getMIMESubtype(), 'Octetstream')
) {
$result = $content;
}

6
libraries/plugins/export/ExportLatex.class.php
View File

@ -335,7 +335,7 @@ class ExportLatex extends ExportPlugin
$buffer = '\\hline ';
for ($i = 0; $i < $columns_cnt; $i++) {
$buffer .= '\\multicolumn{1}{|c|}{\\textbf{'
. $this::texEscape(stripslashes($columns[$i])) . '}} & ';
. self::texEscape(stripslashes($columns[$i])) . '}} & ';
}
$buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
@ -378,7 +378,7 @@ class ExportLatex extends ExportPlugin
|| ! is_null($record[$columns[$i]]))
&& isset($record[$columns[$i]])
) {
$column_value = $this::texEscape(
$column_value = self::texEscape(
stripslashes($record[$columns[$i]])
);
} else {
@ -610,7 +610,7 @@ class ExportLatex extends ExportPlugin
);
}
}
$local_buffer = $this::texEscape($local_buffer);
$local_buffer = self::texEscape($local_buffer);
if ($row['Key']=='PRI') {
$pos=strpos($local_buffer, "\000");
$local_buffer = '\\textit{'