svn: /web/php-rmtools/trunk/include/ Base.php Storage.php
| From: | Pierre Joye | Date: | Mon, 08 Mar 2010 10:58:37 +0000 |
| Subject: | svn: /web/php-rmtools/trunk/include/ Base.php Storage.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-7516@lists.php.net to get a copy of this message | ||
pajoye Mon, 08 Mar 2010 10:58:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295957
Log:
- don't return revisions newer the release
Changed paths:
U web/php-rmtools/trunk/include/Base.php
U web/php-rmtools/trunk/include/Storage.php
Modified: web/php-rmtools/trunk/include/Base.php
===================================================================
--- web/php-rmtools/trunk/include/Base.php 2010-03-08 10:42:21 UTC (rev 295956)
+++ web/php-rmtools/trunk/include/Base.php 2010-03-08 10:58:37 UTC (rev 295957)
@@ -122,7 +122,7 @@
function getRelease($release) {
$release = sqlite_escape_string($release);
- $sql = "SELECT name, release_branch, dev_branch, status,
+ $sql = "SELECT name, release_branch, dev_branch, status, dev_last_active_revision,
dev_first_revision, dev_last_revision, dev_last_update,
release_last_revision, release_last_snap_revision, release_last_update
FROM release WHERE name='" . $release . "'";
Modified: web/php-rmtools/trunk/include/Storage.php
===================================================================
--- web/php-rmtools/trunk/include/Storage.php 2010-03-08 10:42:21 UTC (rev 295956)
+++ web/php-rmtools/trunk/include/Storage.php 2010-03-08 10:58:37 UTC (rev 295957)
@@ -55,6 +55,7 @@
|| $this->status == Base::STATUS_CLOSED) {
return FALSE;
}
+
$svn = new Svn;
$dev_last_revision = $svn->update($this->dev_branch);
if ($this->dev_branch != $this->release_branch) {
@@ -176,7 +177,8 @@
}
function getAll() {
- $res = sqlite_query($this->db, "SELECT * FROM revision WHERE release='" .
$this->release['name'] . "' ORDER by revision", SQLITE_ASSOC);
+ $res = sqlite_query($this->db, "SELECT * FROM revision WHERE release='" .
$this->release['name'] . "' AND revision < " .
$this->release['dev_last_active_revision'] . " ORDER by revision",
SQLITE_ASSOC);
+
if ($res && sqlite_num_rows($res) > 0) {
return sqlite_fetch_all($res);
}