Changeset 13132

Timestamp:

11/03/09 02:06:03 (2 years ago)

Author:

Leonid Sokushev

Message:

ticket #1403 - changed checking for existing default album

Location:

trunk/modules/boonex

Files:

• files/classes/BxFilesPageAlbumsMy.php (modified) (1 diff)
• photos/classes/BxPhotosPageAlbumsMy.php (modified) (1 diff)
• sounds/classes/BxSoundsPageAlbumsMy.php (modified) (1 diff)
• videos/classes/BxVideosPageAlbumsMy.php (modified) (1 diff)

trunk/modules/boonex/files/classes/BxFilesPageAlbumsMy.php

@@ -107 +107 @@
         );
         $sCaption = str_replace('{nickname}', getNickName($this->iOwnerId), $this->oConfig->getGlParam('profile_album_name'));
-        $aList = $this->oAlbum->getAlbumList(array('owner' => $this->iOwnerId, 'caption' => $sCaption, 'show_empty' => true), 0, 0, true);
-        if (empty($aList)) {
+        $aOwnerDefAlbumInfo = $this->oAlbum->getAlbumInfo(array('fileUri'=>uriFilter($sCaption), 'owner'=>$this->iOwnerId));
+        if (!is_array($aOwnerDefAlbumInfo) || empty($aOwnerDefAlbumInfo)) {
             $aData = array(
                 'caption' => $sCaption,

trunk/modules/boonex/photos/classes/BxPhotosPageAlbumsMy.php

@@ -107 +107 @@
         );
         $sCaption = str_replace('{nickname}', getNickName($this->iOwnerId), $this->oConfig->getGlParam('profile_album_name'));
-        $aList = $this->oAlbum->getAlbumList(array('owner' => $this->iOwnerId, 'caption' => $sCaption, 'show_empty' => true), 0, 0, true);
-        if (empty($aList)) {
+        $aOwnerDefAlbumInfo = $this->oAlbum->getAlbumInfo(array('fileUri'=>uriFilter($sCaption), 'owner'=>$this->iOwnerId));
+        if (!is_array($aOwnerDefAlbumInfo) || empty($aOwnerDefAlbumInfo)) {
             $aData = array(
                 'caption' => $sCaption,

trunk/modules/boonex/sounds/classes/BxSoundsPageAlbumsMy.php

@@ -112 +112 @@
         );
         $sCaption = str_replace('{nickname}', getNickName($this->iOwnerId), $this->oConfig->getGlParam('profile_album_name'));
-        $aList = $this->oAlbum->getAlbumList(array('owner' => $this->iOwnerId, 'caption' => $sCaption, 'show_empty' => true), 0, 0, true);
-        if (empty($aList)) {
+        $aOwnerDefAlbumInfo = $this->oAlbum->getAlbumInfo(array('fileUri'=>uriFilter($sCaption), 'owner'=>$this->iOwnerId));
+        if (!is_array($aOwnerDefAlbumInfo) || empty($aOwnerDefAlbumInfo)) {
             $aData = array(
                 'caption' => $sCaption,

trunk/modules/boonex/videos/classes/BxVideosPageAlbumsMy.php

@@ -112 +112 @@
         );
         $sCaption = str_replace('{nickname}', getNickName($this->iOwnerId), $this->oConfig->getGlParam('profile_album_name'));
-        $aList = $this->oAlbum->getAlbumList(array('owner' => $this->iOwnerId, 'caption' => $sCaption, 'show_empty' => true), 0, 0, true);
-        if (empty($aList)) {
+        $aOwnerDefAlbumInfo = $this->oAlbum->getAlbumInfo(array('fileUri'=>uriFilter($sCaption), 'owner'=>$this->iOwnerId));
+        if (!is_array($aOwnerDefAlbumInfo) || empty($aOwnerDefAlbumInfo)) {
             $aData = array(
                 'caption' => $sCaption,