Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2016-07-12 17:47:50 +0300
committerMichal Čihař <michal@cihar.com>2016-07-12 17:49:15 +0300
commitfec9b98a22afd6e484e584c71990cc1325e96f2c (patch)
tree7294a2e7747fa0db756dee8b551f04202b37172a /libraries
parenta3953f88ef5ab287718bf73c454733947ce52128 (diff)
Ensure page number is integer
Even if somebody decides to change configuration storage structure. Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/schema/Export_Relation_Schema.class.php2
-rw-r--r--libraries/schema/User_Schema.class.php14
2 files changed, 8 insertions, 8 deletions
diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php
index 7765203e78..86cec69392 100644
--- a/libraries/schema/Export_Relation_Schema.class.php
+++ b/libraries/schema/Export_Relation_Schema.class.php
@@ -37,7 +37,7 @@ class PMA_Export_Relation_Schema
*/
public function setPageNumber($value)
{
- $this->pageNumber = isset($value) ? $value : 1;
+ $this->pageNumber = isset($value) ? intval($value) : 1;
}
/**
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index a7e802aa14..f822679960 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -198,14 +198,13 @@ class PMA_User_Schema
<option value="0"><?php echo __('Select page'); ?></option>
<?php
while ($curr_page = PMA_DBI_fetch_assoc($page_rs)) {
+ $page_nr = intval($curr_page['page_nr']);
echo "\n" . ' '
- . '<option value="' . $curr_page['page_nr'] . '"';
- if (isset($this->chosenPage)
- && $this->chosenPage == $curr_page['page_nr']
- ) {
+ . '<option value="' . $page_nr . '"';
+ if (isset($this->chosenPage) && $this->chosenPage == page_nr) {
echo ' selected="selected"';
}
- echo '>' . $curr_page['page_nr'] . ': '
+ echo '>' . $page_nr . ': '
. htmlspecialchars($curr_page['page_descr']) . '</option>';
} // end while
echo "\n";
@@ -431,8 +430,9 @@ class PMA_User_Schema
<select name="pdf_page_number" id="pdf_page_number_opt">
<?php
while ($pages = @PMA_DBI_fetch_assoc($test_rs)) {
- echo ' <option value="' . $pages['page_nr'] . '">'
- . $pages['page_nr'] . ': ' . htmlspecialchars($pages['page_descr']) . '</option>' . "\n";
+ $page_nr = intval($pages['page_nr']);
+ echo ' <option value="' . $page_nr . '">'
+ . $page_nr . ': ' . htmlspecialchars($pages['page_descr']) . '</option>' . "\n";
} // end while
PMA_DBI_free_result($test_rs);
unset($test_rs);