[TEP-COMMIT] [CVS catalog] register_globals fix
hpdl-OfajU3CKLf1/[email protected] 24 Feb 2005 01:48:51 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>catalog/catalog/includes/classes</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">database.php</a></tt></td><td align="right" id="added">+4</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database.php.diff?r1=1.6&r2=1.7">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a></td></tr>
</table>
<pre class="comment">
register_globals fix
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes">classes</a><br /></span>
<div class="fileheader"><big><b>database.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database.php.diff?r1=1.6&r2=1.7">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/classes/database.php?rev=1.7&content-type=text/vnd.viewcvs-markup">1.7</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.6 -r1.7
--- database.php 2004/10/26 20:04:04 1.6
+++ database.php 2005/02/24 01:48:49 1.7
@@ -547,11 +547,9 @@
</small></pre><pre class="diff" id="context">
function displayBatchLinksPullDown($batch_keyword = 'page', $parameters = '') {
if (PHP_VERSION < 4.1) {
</pre><pre class="diff" id="removed">- global $_GET;
</pre><pre class="diff" id="added">+ global $_GET<span id="addedchars">, $_SERVER</span>;
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- global $PHP_SELF;
-
</pre><pre class="diff" id="context"> $number_of_pages = ceil($this->batch_size / $this->batch_rows);
if ($number_of_pages > 1) {
</pre><pre class="diff"><small id="info">@@ -574,10 +572,10 @@
</small></pre><pre class="diff" id="context"> }
}
</pre><pre class="diff" id="removed">- $display_links = tep_draw_form($batch_keyword, basename($<span id="removedchars">PHP_SELF</span>), '', 'get');
</pre><pre class="diff" id="added">+ $display_links = tep_draw_form($batch_keyword, basename($<span id="addedchars">_SERVER['PHP_SELF']</span>), '', 'get');
</pre><pre class="diff" id="context">
if ($this->batch_number > 1) {
</pre><pre class="diff" id="removed">- $display_links .= '<a href="' . tep_href_link(basename($<span id="removedchars">PHP_SELF</span>), $get_parameter . $batch_keyword . '=' . ($this->batch_number - 1)) . '" class="splitPageLink">' . PREVNEXT_BUTTON_PREV . '</a>';
</pre><pre class="diff" id="added">+ $display_links .= '<a href="' . tep_href_link(basename($<span id="addedchars">_SERVER['PHP_SELF']</span>), $get_parameter . $batch_keyword . '=' . ($this->batch_number - 1)) . '" class="splitPageLink">' . PREVNEXT_BUTTON_PREV . '</a>';
</pre><pre class="diff" id="context"> } else {
$display_links .= PREVNEXT_BUTTON_PREV;
}
</pre><pre class="diff"><small id="info">@@ -585,7 +583,7 @@
</small></pre><pre class="diff" id="context"> $display_links .= '&nbsp;&nbsp;' . sprintf(TEXT_RESULT_PAGE, osc_draw_pull_down_menu($batch_keyword, $pages_array, $this->batch_number, 'onChange="this.form.submit();"'), $number_of_pages) . '&nbsp;&nbsp;';
if (($this->batch_number < $number_of_pages) && ($number_of_pages != 1)) {
</pre><pre class="diff" id="removed">- $display_links .= '<a href="' . tep_href_link(basename($<span id="removedchars">PHP_SELF</span>), $get_parameter . $batch_keyword . '=' . ($this->batch_number + 1)) . '" class="splitPageLink">' . PREVNEXT_BUTTON_NEXT . '</a>';
</pre><pre class="diff" id="added">+ $display_links .= '<a href="' . tep_href_link(basename($<span id="addedchars">_SERVER['PHP_SELF']</span>), $get_parameter . $batch_keyword . '=' . ($this->batch_number + 1)) . '" class="splitPageLink">' . PREVNEXT_BUTTON_NEXT . '</a>';
</pre><pre class="diff" id="context"> } else {
$display_links .= PREVNEXT_BUTTON_NEXT;
}
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.9</small></center>
</body></html>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click