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

Merge commit '7602e1593c1565b4dbd90df13fd162cee6546798' into QA_3_4

Browse Source
This commit is contained in:
Marc Delisle
2011-06-20 10:12:52 -04:00
parent 6616a6b34c 7602e1593c
commit 3bd3f60b28
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
enum_editor.php
View File

@@ -57,8 +57,8 @@ require_once './libraries/header_meta_style.inc.php';
<?php echo __('+ Restart insertion and add a new value'); ?> <?php echo __('+ Restart insertion and add a new value'); ?>
</a> </a>
</p> </p>
<input type="hidden" name="token" value="<?php echo $_GET['token']; ?>" /> <input type="hidden" name="token" value="<?php echo htmlspecialchars($_GET['token']); ?>" />
<input type="hidden" name="field" value="<?php echo $_GET['field']; ?>" /> <input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" />
<input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" /> <input type="hidden" name="num_fields" value="<?php echo $total_fields; ?>" />
<input type="submit" value="<?php echo __('Go'); ?>" /> <input type="submit" value="<?php echo __('Go'); ?>" />
</form> </form>
@@ -66,7 +66,7 @@ require_once './libraries/header_meta_style.inc.php';
<div id="enum_editor_output"> <div id="enum_editor_output">
<h3><?php echo __('Output'); ?></h3> <h3><?php echo __('Output'); ?></h3>
<p><?php echo __('Copy and paste the joined values into the "Length/Values" field'); ?></p> <p><?php echo __('Copy and paste the joined values into the "Length/Values" field'); ?></p>
<textarea id="joined_values" cols="95" rows="5"><?php echo join(",", $values); ?></textarea> <textarea id="joined_values" cols="95" rows="5"><?php echo htmlspecialchars(join(",", $values)); ?></textarea>
</div> </div>
</div> </div>
</body> </body>

3
server_replication.php
View File

@@ -53,7 +53,7 @@ if (isset($GLOBALS['sr_take_action'])) {
if (! $link_to_master) { if (! $link_to_master) {
$_SESSION['replication']['sr_action_status'] = 'error'; $_SESSION['replication']['sr_action_status'] = 'error';
$_SESSION['replication']['sr_action_info'] = sprintf(__('Unable to connect to master %s.'), $sr['hostname']); $_SESSION['replication']['sr_action_info'] = sprintf(__('Unable to connect to master %s.'), htmlspecialchars($sr['hostname']));
} else { } else {
// Read the current master position // Read the current master position
$position = PMA_replication_slave_bin_log_master($link_to_master); $position = PMA_replication_slave_bin_log_master($link_to_master);
@@ -70,6 +70,7 @@ if (isset($GLOBALS['sr_take_action'])) {
} else { } else {
$_SESSION['replication']['sr_action_status'] = 'success'; $_SESSION['replication']['sr_action_status'] = 'success';
$_SESSION['replication']['sr_action_info'] = sprintf(__('Master server changed succesfully to %s'), $sr['hostname']); $_SESSION['replication']['sr_action_info'] = sprintf(__('Master server changed succesfully to %s'), $sr['hostname']);
$_SESSION['replication']['sr_action_info'] = sprintf(__('Master server changed succesfully to %s'), htmlspecialchars($sr['hostname']));
} }
} }
} }