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

Indentation.

Browse Source
This commit is contained in:
Michal Čihař
2010-07-21 09:55:13 +02:00
parent 715f2f04f6
commit 9b2aa3c40d
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/common.lib.php
View File

@@ -2842,18 +2842,19 @@ function PMA_expandUserString($string, $escape = NULL) {
/* Replacement mapping */
$replace = array(
'@HTTP_HOST@' => $http_host,
'@SERVER@' => $server_name,
'__SERVER__' => $server_name,
'@VERBOSE@' => $server_verbose,
'@VSERVER@' => $server_verbose_or_name,
'@DATABASE@' => $database,
'__DB__' => $database,
'@TABLE@' => $table,
'__TABLE__' => $table,
'@PHPMYADMIN@' => $phpmyadmin_version,
);
'@HTTP_HOST@' => $http_host,
'@SERVER@' => $server_name,
'__SERVER__' => $server_name,
'@VERBOSE@' => $server_verbose,
'@VSERVER@' => $server_verbose_or_name,
'@DATABASE@' => $database,
'__DB__' => $database,
'@TABLE@' => $table,
'__TABLE__' => $table,
'@PHPMYADMIN@' => $phpmyadmin_version,
);
/* Optional escaping */
if (!is_null($escape)) {
foreach($replace as $key => $val) {
$replace[$key] = $escape($val);

12
libraries/export/latex.php
View File

@@ -81,12 +81,12 @@ if (isset($plugin_list)) {
* @access private
*/
function PMA_texEscape($string) {
$escape = array('$', '%', '{', '}', '&', '#', '_', '^');
$cnt_escape = count($escape);
for ($k=0; $k < $cnt_escape; $k++) {
$string = str_replace($escape[$k], '\\' . $escape[$k], $string);
}
return $string;
$escape = array('$', '%', '{', '}', '&', '#', '_', '^');
$cnt_escape = count($escape);
for ($k=0; $k < $cnt_escape; $k++) {
$string = str_replace($escape[$k], '\\' . $escape[$k], $string);
}
return $string;
}
/**