Author: dgoette
Date: Tue May 5 01:07:34 2009
New Revision: 404
URL:
http://svn.reactos.org/svn/reactos?rev=404&view=rev
Log:
now this is hopefully the last commit for the compare function :)
Modified:
branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
Modified:
branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
---
branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1]
(original)
+++
branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Tue May
5 01:07:34 2009
@@ -1573,7 +1573,9 @@
case 'diff2':
document.getElementById('frmdiff').innerHTML = http_request.responseText;
loadEditor('diffentry');
- document.getElementById('frmeditdiff').innerHTML =
WDiffShortenOutput(WDiffString(document.getElementById('frmeditdiff1').innerHTML,
document.getElementById('frmeditdiff2').innerHTML));
+ if (document.getElementById('frmeditdiff1') &&
document.getElementById('frmeditdiff2')) {
+ document.getElementById('frmeditdiff').innerHTML =
WDiffShortenOutput(WDiffString(document.getElementById('frmeditdiff1').innerHTML,
document.getElementById('frmeditdiff2').innerHTML));
+ }
break;
case 'changetags':
Modified:
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
URL:
http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r…
==============================================================================
---
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
[iso-8859-1] (original)
+++
branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEdito…
[iso-8859-1] Tue May 5 01:07:34 2009
@@ -317,7 +317,7 @@
$revisions_count = $stmt->fetchColumn();
// No compare
- if ($revisions_count == 0) {
+ if ($revisions_count < 2) {
$stmt=&DBConnection::getInstance()->prepare("SELECT name FROM
".ROSCMST_LANGUAGES." WHERE id=:lang_id");
$stmt->bindParam('lang_id',Language::getStandardId(),PDO::PARAM_INT);
$stmt->execute();