summaryrefslogtreecommitdiff
path: root/modules/gallery/models
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-05-31 23:28:42 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-05-31 23:28:42 -0700
commit3c24d9476618496c8f2e1ca2f6025fa157120e43 (patch)
treee3d8b381098affa3081cc95cd74ebeabef972ab3 /modules/gallery/models
parent463b3454ae7633815e24cdf86e81c57409dd15a9 (diff)
parent79a05adb9d941671cefbdf6b1cc97f0cd84fabf3 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/models')
-rw-r--r--modules/gallery/models/item.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 4b8cac8e..9406f5d9 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -287,6 +287,10 @@ class Item_Model extends ORM_MPTT {
* @return string
*/
public function relative_path() {
+ if (!$this->loaded) {
+ return;
+ }
+
if (!isset($this->relative_path_cache)) {
$paths = array();
foreach (Database::instance()