  |
5624 | 5624 | | |
| |
5625 | 5625 | | <ul> |
| |
5626 | 5626 | | <li>When restoring a database, only drop tables that are being restored.</li> |
 |
| 5627 | + | <li>Show only .sql, .zip, and .gz files in the backups listing.</li> |
|
5627 | 5628 | | </ul> |
| |
5628 | 5629 | | |
| |
5629 | 5630 | | <p class="affectedFiles"><b>Affected Files</b><br /> |
| |
5630 | 5631 | | catalog/admin/backup.php</p> |
| |
5631 | 5632 | | |
|
5632 | | - | <span class="affectedFiles">File: catalog/admin/backup.php (<a href="http://svn.oscommerce.com/fisheye/browse/osCommerce/oscommerce2/trunk/catalog/admin/backup.php?r1=1755&r2=1805">online</a>) (<a href="http://svn.oscommerce.com/fisheye/rdiff/osCommerce/oscommerce2/trunk/catalog/admin/backup.php?r1=1755&r2=1805">raw</a>)</span> |
| |
| 5633 | + | <span class="affectedFiles">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>)</span> |
|
5633 | 5634 | | |
| |
5634 | 5635 | | <table class="diff hardDiff unifiedDiff" cellspacing="0"> |
| |
5635 | 5636 | | <tr> |
| |
|
|
 |
… |
|
5740 | 5741 | | <tr> |
| |
5741 | 5742 | | <td class="diffLineNumbers">254</td><td class="diffLineNumbers">264</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> tep_db_query($sql_array[$i]);</td> |
| |
5742 | 5743 | | </tr> |
|
| 5744 | + | <tr class="diffSkipped"> |
| |
| 5745 | + | <td class="diffLineNumbers"> </td> |
| |
| 5746 | + | <td class="diffLineNumbers"> </td> |
| |
| 5747 | + | <td class="diffMarkerCol"><pre class="diffPre">…</pre></td> |
| |
| 5748 | + | <td class="diffContent"><pre class="diffPre">…</pre></td> |
| |
| 5749 | + | </tr> |
| |
| 5750 | + | <tr> |
| |
| 5751 | + | <td class="diffLineNumbers">362</td><td class="diffLineNumbers">372</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $dir = dir(DIR_FS_BACKUP);</td> |
| |
| 5752 | + | </tr> |
| |
| 5753 | + | <tr> |
| |
| 5754 | + | <td class="diffLineNumbers">363</td><td class="diffLineNumbers">373</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $contents = array();</td> |
| |
| 5755 | + | </tr> |
| |
| 5756 | + | <tr> |
| |
| 5757 | + | <td class="diffLineNumbers">364</td><td class="diffLineNumbers">374</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> while ($file = $dir->read()) {</td> |
| |
| 5758 | + | </tr> |
| |
| 5759 | + | <tr> |
| |
| 5760 | + | <td class="diffLineNumbersA">365</td><td class="diffLineNumbers"> </td><td class="diffMarkerColA"><span class="textDelMarker">-</span></td><td class="lineContent ediffContentA"> if (!is_dir(DIR_FS_BACKUP . $file)) {</td> |
| |
| 5761 | + | </tr> |
| |
| 5762 | + | <tr> |
| |
| 5763 | + | <td class="diffLineNumbers"> </td><td class="diffLineNumbersB">375</td><td class="diffMarkerColB"><span class="textAddMarker">+</span></td><td class="lineContent ediffContentB"> if (!is_dir(DIR_FS_BACKUP . $file) <span class="ediffChangedB">&</span><span class="ediffChangedB">&</span> <span class="ediffChangedB">in</span><span class="ediffChangedB">_</span><span class="ediffChangedB">array</span><span class="ediffChangedB">(</span><span class="ediffChangedB">substr</span><span class="ediffChangedB">(</span><span class="ediffChangedB">$</span><span class="ediffChangedB">file</span><span class="ediffChangedB">,</span> <span class="ediffChangedB">-</span><span class="ediffChangedB">3</span>)<span class="ediffChangedB">,</span> <span class="ediffChangedB">array</span><span class="ediffChangedB">(</span><span class="ediffChangedB">'</span><span class="ediffChangedB">zip</span><span class="ediffChangedB">'</span><span class="ediffChangedB">,</span> <span class="ediffChangedB">'</span><span class="ediffChangedB">sql</span><span class="ediffChangedB">'</span><span class="ediffChangedB">,</span> <span class="ediffChangedB">'</span><span class="ediffChangedB">.</span><span class="ediffChangedB">gz</span><span class="ediffChangedB">'</span><span class="ediffChangedB">)</span><span class="ediffChangedB">)</span><span class="ediffChangedB">)</span> {</td> |
| |
| 5764 | + | </tr> |
| |
| 5765 | + | <tr> |
| |
| 5766 | + | <td class="diffLineNumbers">366</td><td class="diffLineNumbers">376</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> $contents[] = $file;</td> |
| |
| 5767 | + | </tr> |
| |
| 5768 | + | <tr> |
| |
| 5769 | + | <td class="diffLineNumbers">367</td><td class="diffLineNumbers">377</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td> |
| |
| 5770 | + | </tr> |
| |
| 5771 | + | <tr> |
| |
| 5772 | + | <td class="diffLineNumbers">368</td><td class="diffLineNumbers">378</td><td class="diffMarkerCol"> </td><td class="lineContent diffContent"> }</td> |
| |
| 5773 | + | </tr> |
|
5743 | 5774 | | </table> |
| |
5744 | 5775 | | |
| |
5745 | 5776 | | <h3>[C] Update new products module</h3> |