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 2014-07-11 21:48:03 +02:00
commit cd22bc28a4
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
- bug #4485 Sorting breaks the copy column feature
- bug #4440 Javascript error when renaming table
- bug #4483 'New window' link (selflink) disappears, causing Javascript error
- bug #4489 Incorrect detection of privileges for routine creation
4.2.5.0 (2014-06-26)
- bug #4467 shell_exec() has been disabled for security reasons

15
libraries/rte/rte_footer.lib.php
View File

@ -28,16 +28,11 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name)
$retval .= "<fieldset class='left'>\n";
$retval .= "<legend>" . _pgettext('Create new procedure', 'New') . "</legend>\n";
$retval .= " <div class='wrap'>\n";
if (PMA_Util::currentUserHasPrivilege($priv, $db)) {
$retval .= " <a {$ajax_class['add']} ";
$retval .= "href='db_" . strtolower($name) . "s.php";
$retval .= "?$url_query&amp;add_item=1' onclick='$.datepicker.initialized = false;'>";
$retval .= PMA_Util::getIcon($icon);
$retval .= PMA_RTE_getWord('add') . "</a>\n";
} else {
$retval .= " " . PMA_Util::getIcon($icon);
$retval .= PMA_RTE_getWord('no_create') . "\n";
}
$retval .= " <a {$ajax_class['add']} ";
$retval .= "href='db_" . strtolower($name) . "s.php";
$retval .= "?$url_query&amp;add_item=1' onclick='$.datepicker.initialized = false;'>";
$retval .= PMA_Util::getIcon($icon);
$retval .= PMA_RTE_getWord('add') . "</a>\n";
$retval .= " " . PMA_Util::showMySQLDocu($docu) . "\n";
$retval .= " </div>\n";
$retval .= "</fieldset>\n";

2
libraries/rte/rte_list.lib.php
View File

@ -148,8 +148,6 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
$retval .= " </td>\n";
$retval .= " <td>\n";
if ($routine['ROUTINE_DEFINITION'] !== null
&& PMA_Util::currentUserHasPrivilege('ALTER ROUTINE', $db)
&& PMA_Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
) {
$retval .= ' <a ' . $ajax_class['edit']
. ' href="db_routines.php?'