FishEye: diff osCommerce/oscommerce2/trunk/upgrade.html

2095

catalog/admin/includes/functions/sessions.php

2096

catalog/includes/functions/sessions.php

2097

2098

-

File: catalog/admin/includes/functions/sessions.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/admin/includes/functions/sessions.php?r1=1583&r2=1741">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/admin/includes/functions/sessions.php?r1=1583&r2=1741">raw</a>)

2098

+

File: catalog/admin/includes/functions/sessions.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/admin/includes/functions/sessions.php?r1=1583&r2=1830">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/admin/includes/functions/sessions.php?r1=1583&r2=1830">raw</a>)

2099

2100

2101

<tr>

2174

2175

</tr>

2176

<tr>

2177

-

<td class="diffLineNumbersA">119</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">      return isset($_SESSION[$variable]);</td>

2177

+

<td class="diffLineNumbersA">119</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">      return isset($_SESSION[$variable]);</td>

2178

</tr>

2179

<tr>

2180

-

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">123</td><td class="diffMarkerColB">+</td><td class="lineContent ediffContentB">      return array_key_exists($variable, $_SESSION);</td>

2180

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">123</td><td class="diffMarkerColB">+</td><td class="lineContent ediffContentB">      return isset($_SESSION) && array_key_exists($variable, $_SESSION);</td>

2181

</tr>

2182

<tr>

2183

2192

2193

2194

2195

-

File: catalog/includes/functions/sessions.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/includes/functions/sessions.php?r1=1647&r2=1741">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/includes/functions/sessions.php?r1=1647&r2=1741">raw</a>)

2195

+

File: catalog/includes/functions/sessions.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/includes/functions/sessions.php?r1=1647&r2=1830">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/includes/functions/sessions.php?r1=1647&r2=1830">raw</a>)

2196

2197

2198

<tr>

2292

2293

</tr>

2294

<tr>

2295

-

<td class="diffLineNumbersA">120</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">      return isset($_SESSION[$variable]);</td>

2295

+

<td class="diffLineNumbersA">120</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA">-</td><td class="lineContent ediffContentA">      return isset($_SESSION[$variable]);</td>

2296

</tr>

2297

<tr>

2298

-

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">127</td><td class="diffMarkerColB">+</td><td class="lineContent ediffContentB">      return array_key_exists($variable, $_SESSION);</td>

2298

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">127</td><td class="diffMarkerColB">+</td><td class="lineContent ediffContentB">      return isset($_SESSION) && array_key_exists($variable, $_SESSION);</td>

2299

</tr>

2300

<tr>

2301

5628

</ul>

5629

5630

Affected Files

5631

-

catalog/admin/backup.php

5631

+

catalog/admin/backup.php

5632

+

catalog/admin/includes/functions/compatibility.php

5632

5633

5634

File: catalog/admin/backup.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/admin/backup.php?r1=1755&r2=1821">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/admin/backup.php?r1=1755&r2=1821">raw</a>)

5634

5635

5773

5774

</tr>

5774

5775

</table>

5775

5776

5777

+

5778

+

5779

+

File: catalog/admin/includes/functions/compatibility.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/admin/includes/functions/compatibility.php?r1=1748&r2=1829">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/admin/includes/functions/compatibility.php?r1=1748&r2=1829">raw</a>)

5780

+

5781

+

5782

+

<tr>

5783

+

<td class="diffLineNumbers">237</td><td class="diffLineNumbers">237</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent">      return implode($arg_separator, $tmp);</td>

5784

+

</tr>

5785

+

<tr>

5786

+

5787

+

</tr>

5788

+

<tr>

5789

+

5790

+

</tr>

5791

+

<tr>

5792

+

5793

+

</tr>

5794

+

<tr>

5795

+

5796

+

</tr>

5797

+

<tr>

5798

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">242</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB"> * stripos() natively supported from PHP 5.0</td>

5799

+

</tr>

5800

+

<tr>

5801

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">243</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB"> * From Pear::PHP_Compat</td>

5802

+

</tr>

5803

+

<tr>

5804

+

5805

+

</tr>

5806

+

<tr>

5807

+

5808

+

</tr>

5809

+

<tr>

5810

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">246</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">  if (!function_exists('stripos')) {</td>

5811

+

</tr>

5812

+

<tr>

5813

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">247</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">    function stripos($haystack, $needle, $offset = null) {</td>

5814

+

</tr>

5815

+

<tr>

5816

+

5817

+

</tr>

5818

+

<tr>

5819

+

5820

+

</tr>

5821

+

<tr>

5822

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">250</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">      if (!is_null($offset)) {</td>

5823

+

</tr>

5824

+

<tr>

5825

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">251</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">        if ($offset > 0) {</td>

5826

+

</tr>

5827

+

<tr>

5828

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">252</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">          $haystack = substr($haystack, $offset, strlen($haystack) - $offset);</td>

5829

+

</tr>

5830

+

<tr>

5831

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">253</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">          $fix = $offset;</td>

5832

+

</tr>

5833

+

<tr>

5834

+

5835

+

</tr>

5836

+

<tr>

5837

+

5838

+

</tr>

5839

+

<tr>

5840

+

5841

+

</tr>

5842

+

<tr>

5843

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">257</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">      $segments = explode(strtolower($needle), strtolower($haystack), 2);</td>

5844

+

</tr>

5845

+

<tr>

5846

+

5847

+

</tr>

5848

+

<tr>

5849

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">259</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">// Check there was a match</td>

5850

+

</tr>

5851

+

<tr>

5852

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">260</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">      if (count($segments) == 1) {</td>

5853

+

</tr>

5854

+

<tr>

5855

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">261</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">        return false;</td>

5856

+

</tr>

5857

+

<tr>

5858

+

5859

+

</tr>

5860

+

<tr>

5861

+

5862

+

</tr>

5863

+

<tr>

5864

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">264</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">      $position = strlen($segments[0]) + $fix;</td>

5865

+

</tr>

5866

+

<tr>

5867

+

5868

+

</tr>

5869

+

<tr>

5870

+

<td class="diffLineNumbers"> </td><td class="diffLineNumbersB">266</td><td class="diffMarkerColB">+</td><td class="lineContent diffContentB">      return $position;</td>

5871

+

</tr>

5872

+

<tr>

5873

+

5874

+

</tr>

5875

+

<tr>

5876

+

5877

+

</tr>

5878

+

<tr>

5879

+

5880

+

</tr>

5881

+

</table>

5882

+

5776

5883

<h3>[C] Update new products module</h3>

5777

5884

5778

5885

<ul>

FishEye

Mode

Context

Other Diffs

Ignore

Diff