Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

2013-05-29 14:24:41 -04:00 · 2013-05-29 14:24:41 -04:00 · 59d1b1e968
parent e2810606ab 2a2fd45567
commit 59d1b1e968
1 changed files with 8 additions and 0 deletions
--- a/airtime_mvc/application/models/airtime/CcFiles.php
+++ b/airtime_mvc/application/models/airtime/CcFiles.php
@ -57,6 +57,14 @@ class CcFiles extends BaseCcFiles {
        return $this;
    }

+    public function setDbTrackNumber($v)
+    {
+        $max = pow(2, 31)-1;
+        $v = ($v > $max) ? $max : $v;
+
+        return parent::setDbTrackNumber($v);
+    }
+
    // returns true if the file exists and is not hidden
    public function visible() {
        return $this->getDbFileExists() && !$this->getDbHidden();