@@ -81,8 +81,7 @@ |
||
| 81 | 81 | foreach( $manager->search( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
| 88 | 87 | } |
@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->search( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
| 88 | 87 | } |
@@ -159,8 +158,7 @@ discard block |
||
| 159 | 158 | $listItem = $listMap[$url][$type][$listtype]; |
| 160 | 159 | $refItem = $listItem->getRefItem(); |
| 161 | 160 | unset( $listItems[$listItem->getId()] ); |
| 162 | - } |
|
| 163 | - else |
|
| 161 | + } else |
|
| 164 | 162 | { |
| 165 | 163 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 166 | 164 | $refItem = $refManager->create()->setType( $type ); |
@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->search( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
| 88 | 87 | } |
@@ -138,8 +137,7 @@ discard block |
||
| 138 | 137 | $listItem = $listMap[$content][$type][$listtype]; |
| 139 | 138 | $refItem = $listItem->getRefItem(); |
| 140 | 139 | unset( $listItems[$listItem->getId()] ); |
| 141 | - } |
|
| 142 | - else |
|
| 140 | + } else |
|
| 143 | 141 | { |
| 144 | 142 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 145 | 143 | $refItem = $refManager->create()->setType( $type ); |
@@ -162,8 +162,7 @@ |
||
| 162 | 162 | $listItem = $listMap[$url][$type][$listtype]; |
| 163 | 163 | $refItem = $listItem->getRefItem(); |
| 164 | 164 | unset( $listItems[$listItem->getId()] ); |
| 165 | - } |
|
| 166 | - else |
|
| 165 | + } else |
|
| 167 | 166 | { |
| 168 | 167 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 169 | 168 | $refItem = $refManager->create()->setType( $type ); |
@@ -139,8 +139,7 @@ |
||
| 139 | 139 | $listItem = $listMap[$content][$type][$listtype]; |
| 140 | 140 | $refItem = $listItem->getRefItem(); |
| 141 | 141 | unset( $listItems[$listItem->getId()] ); |
| 142 | - } |
|
| 143 | - else |
|
| 142 | + } else |
|
| 144 | 143 | { |
| 145 | 144 | $listItem = $manager->createListItem()->setType( $listtype ); |
| 146 | 145 | $refItem = $refManager->create()->setType( $type ); |
@@ -118,9 +118,12 @@ |
||
| 118 | 118 | |
| 119 | 119 | foreach( $items as $item ) |
| 120 | 120 | { |
| 121 | - try { |
|
| 121 | + try |
|
| 122 | + { |
|
| 122 | 123 | $manager->save( $cntl->scale( $item, $force ) ); |
| 123 | - } catch( \Exception $e ) { |
|
| 124 | + } |
|
| 125 | + catch( \Exception $e ) |
|
| 126 | + { |
|
| 124 | 127 | $msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() ); |
| 125 | 128 | $logger->error( $msg, 'media/scale' ); |
| 126 | 129 | } |
@@ -96,8 +96,7 @@ |
||
| 96 | 96 | $files[] = $entry->getPathname(); |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - } |
|
| 100 | - else |
|
| 99 | + } else |
|
| 101 | 100 | { |
| 102 | 101 | $files[] = $location; |
| 103 | 102 | } |
@@ -96,8 +96,7 @@ |
||
| 96 | 96 | $files[] = $entry->getPathname(); |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - } |
|
| 100 | - else |
|
| 99 | + } else |
|
| 101 | 100 | { |
| 102 | 101 | $files[] = $location; |
| 103 | 102 | } |
@@ -592,8 +592,7 @@ |
||
| 592 | 592 | { |
| 593 | 593 | $manager->move( $item->getId(), $item->getParentId(), $parentid ); |
| 594 | 594 | $item = $manager->save( $item ); |
| 595 | - } |
|
| 596 | - else |
|
| 595 | + } else |
|
| 597 | 596 | { |
| 598 | 597 | $item = $manager->insert( $item, $parentid ); |
| 599 | 598 | } |