appdb/include downloadurl.php version_queue.php
WineHQ
wineowner at wine.codeweavers.com
Tue Apr 24 18:38:41 CDT 2007
ChangeSet ID: 31103
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner at winehq.org 2007/04/24 18:38:41
Modified files:
include : downloadurl.php version_queue.php
Log message:
Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Always read input first in downloadurl::outputEditorSingle(). Makes sure changes aren't lost
when reloading the form due to input errors
Patch: http://cvs.winehq.org/patch.py?id=31103
Old revision New revision Changes Path
1.13 1.14 +7 -5 appdb/include/downloadurl.php
1.7 1.8 +2 -0 appdb/include/version_queue.php
Index: appdb/include/downloadurl.php
diff -u -p appdb/include/downloadurl.php:1.13 appdb/include/downloadurl.php:1.14
--- appdb/include/downloadurl.php:1.13 24 Apr 2007 23:38:41 -0000
+++ appdb/include/downloadurl.php 24 Apr 2007 23:38:41 -0000
@@ -224,7 +224,12 @@ class downloadurl
/* Output an editor for a single new URL */
function outputEditorSingle($iVersionId = NULL, $aValues = NULL)
{
- if($iVersionId)
+ if($aValues["sDownloadUrlUrl"] &&
+ $aValues["sDownloadUrlDescription"])
+ {
+ $sDownloadUrlUrl = $aValues["sDownloadUrlUrl"];
+ $sDownloadUrlDescription = $aValues["sDownloadUrlDescription"];
+ } else if($iVersionId)
{
if($hResult = appData::getData($iVersionId, "downloadurl",
TRUE, TRUE))
@@ -233,12 +238,9 @@ class downloadurl
$sDownloadUrlUrl = $oRow->url;
$sDownloadUrlDescription = $oRow->description;
}
- } else
- {
- $sDownloadUrlUrl = $aValues["sDownloadUrlUrl"];
- $sDownloadUrlDescription = $aValues["sDownloadUrlDescription"];
}
+
$sReturn .= html_frame_start("Download URL","90%");
$sReturn .= html_table_begin("");
Index: appdb/include/version_queue.php
diff -u -p appdb/include/version_queue.php:1.7 appdb/include/version_queue.php:1.8
--- appdb/include/version_queue.php:1.7 24 Apr 2007 23:38:41 -0000
+++ appdb/include/version_queue.php 24 Apr 2007 23:38:41 -0000
@@ -71,6 +71,8 @@ class version_queue
function outputEditor()
{
+ global $aClean;
+
/* Display duplicate list if this is a an existing version */
if($this->oVersion->iVersionId)
$this->displayMoveTestTable();
More information about the wine-cvs
mailing list