Merge "Bug 1629147: Returning correct collection url"

0a8efb5d · Aaron Wells · Gerrit Code Review · 1352a652 · b40e7c47 · 0a8efb5d
Commit 0a8efb5d authored Oct 18, 2016 by Aaron Wells Committed by Gerrit Code Review Oct 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

htdocs/lib/collection.php htdocs/lib/collection.php +2 -1

No files found.
--- a/htdocs/lib/collection.php
+++ b/htdocs/lib/collection.php
@@ -991,11 +991,12 @@ class Collection {
            if ($this->framework) {
                if ($full) {
                    $this->fullurl = Collection::get_framework_url($this);
+                    return $this->fullurl;
                }
                else {
                    $this->frameworkurl = Collection::get_framework_url($this, false);
+                    return $this->frameworkurl;
                }
-                return $this->frameworkurl;
            }

            $v = new View(0, $views['views'][0]);