nettika/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:
Pootle server
2011-04-16 20:40:05 +02:00
parent 2ec332b6b3 5381b2f600
commit 2dd91e2c9e
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation.html
View File

@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>phpMyAdmin 3.4.0-rc1-dev - Documentation</title> <title>phpMyAdmin 3.4.0-rc2-dev - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" /> <link rel="stylesheet" type="text/css" href="docs.css" />
</head> </head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header"> <div id="header">
<h1> <h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
3.4.0-rc1-dev 3.4.0-rc2-dev
Documentation Documentation
</h1> </h1>
</div> </div>

2
README
View File

@@ -1,7 +1,7 @@
phpMyAdmin - Readme phpMyAdmin - Readme
=================== ===================
Version 3.4.0-rc1-dev Version 3.4.0-rc2-dev
A set of PHP-scripts to manage MySQL over the web. A set of PHP-scripts to manage MySQL over the web.

2
libraries/Config.class.php
View File

@@ -96,7 +96,7 @@ class PMA_Config
*/ */
function checkSystem() function checkSystem()
{ {
$this->set('PMA_VERSION', '3.4.0-rc1-dev'); $this->set('PMA_VERSION', '3.4.0-rc2-dev');
/** /**
* @deprecated * @deprecated
*/ */

4
navigation.php
View File

@@ -235,9 +235,9 @@ if (! $GLOBALS['server']) {
// In this case, the database should not be collapsible/expandable // In this case, the database should not be collapsible/expandable
$img_plus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"' $img_plus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"'
.' width="9" height="9" alt="+" />'; .' alt="+" />';
$img_minus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"' $img_minus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"'
.' width="9" height="9" alt="-" />'; .' alt="-" />';
$href_left = '<a onclick="if (toggle(\'%d\')) return false;"' $href_left = '<a onclick="if (toggle(\'%d\')) return false;"'
.' href="navigation.php?%s" target="_self">'; .' href="navigation.php?%s" target="_self">';