BUG: refs #0380. Added comments to getDefaultAssetstore().

Michael Grauer · Michael Grauer · commit a5ce6e5522a6 · 2011-12-12T20:38:13.000-05:00
diff --git a/core/models/base/AssetstoreModelBase.php b/core/models/base/AssetstoreModelBase.php
@@ -170,6 +170,8 @@ public function getDefault()
 
     if($defaultAssetstoreId == null || $defaultAssetstore == false)
       {
+      // since we don't have a default_assetstore, save one here in settings
+      // first try one named Default
       $found = $this->findBy('name', 'Default');
       if(empty($found))
         {
@@ -179,6 +181,7 @@ public function getDefault()
           throw new Zend_Exception("No assetstore found in the database");
           }
         }
+      // otherwise take the first
       $defaultAssetstore = $found[0];
       // explicit cast to string, as the setConfig method expects a string
       $defaultAssetstoreId = (string)$defaultAssetstore->getKey();

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,8 @@ public function getDefault()`
`170`	`170`
`171`	`171`	`if($defaultAssetstoreId == null \|\| $defaultAssetstore == false)`
`172`	`172`	`{`
	`173`	`+ // since we don't have a default_assetstore, save one here in settings`
	`174`	`+ // first try one named Default`
`173`	`175`	`$found = $this->findBy('name', 'Default');`
`174`	`176`	`if(empty($found))`
`175`	`177`	`{`
`@@ -179,6 +181,7 @@ public function getDefault()`
`179`	`181`	`throw new Zend_Exception("No assetstore found in the database");`
`180`	`182`	`}`
`181`	`183`	`}`
	`184`	`+ // otherwise take the first`
`182`	`185`	`$defaultAssetstore = $found[0];`
`183`	`186`	`// explicit cast to string, as the setConfig method expects a string`
`184`	`187`	`$defaultAssetstoreId = (string)$defaultAssetstore->getKey();`