Changeset 1280:d9627cb1cb02 for plugins/attachments

Timestamp:

08/06/13 10:03:57 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Backed out merge changeset: 48c827f9db99

Backed out merge revision to its first parent (5ceeeb6f5454)

File:

• plugins/attachments/_public.php (modified) (12 diffs)

plugins/attachments/_public.php

@@ -40 +40 @@
           "<?php\n".
           'if ($_ctx->posts !== null && $core->media) {'."\n".
-          '$_ctx->attachments = $core->media->getPostMedia($_ctx->posts->post_id, null, true);'."\n".
+               '$_ctx->attachments = new ArrayObject($core->media->getPostMedia($_ctx->posts->post_id));'."\n".
           "?>\n".
           
-          '<?php $attach_i = 0; ?>'. // LEGACY
-          '<?php while ($_ctx->attachments->fetch()) : ?>'.
-          
-          '<?php $GLOBALS[\'attach_i\'] = $attach_i; $attach_f = $_ctx->attachments; $GLOBALS[\'attach_f\'] = $attach_f;'. // LEGACY
-          '$_ctx->file_url = $attach_f->file_url; ?>'. // LEGACY
+          '<?php foreach ($_ctx->attachments as $attach_i => $attach_f) : '.
+          '$GLOBALS[\'attach_i\'] = $attach_i; $GLOBALS[\'attach_f\'] = $attach_f;'.
+          '$_ctx->file_url = $attach_f->file_url; ?>'.
           $content.
-          '<?php $attach_i++; ?>'. // LEGACY
-          '<?php endwhile; '.
-          '$_ctx->attachments = null; ?>'.
+          '<?php endforeach; $_ctx->attachments = null; unset($attach_i,$attach_f,$_ctx->file_url); ?>'.
           
           "<?php } ?>\n";
@@ -64 +60 @@
      {
           return
-          "<?php if (\$_ctx->attachments->isStart()) : ?>".
+          "<?php if (\$attach_i == 0) : ?>".
           $content.
           "<?php endif; ?>";
@@ -75 +71 @@
      {
           return
-          "<?php if (\$_ctx->attachments->isEnd()) : ?>".
+          "<?php if (\$attach_i+1 == count(\$_ctx->attachments)) : ?>".
           $content.
           "<?php endif; ?>";
@@ -97 +93 @@
           if (isset($attr['is_image'])) {
                $sign = (boolean) $attr['is_image'] ? '' : '!';
-               $if[] = $sign.'$_ctx->attachments->media_image';
+               $if[] = $sign.'$attach_f->media_image';
           }
           
           if (isset($attr['has_thumb'])) {
                $sign = (boolean) $attr['has_thumb'] ? '' : '!';
-               $if[] = $sign.'isset($_ctx->attachments->media_thumb[\'sq\'])';
+               $if[] = $sign.'isset($attach_f->media_thumb[\'sq\'])';
           }
           
           if (isset($attr['is_mp3'])) {
                $sign = (boolean) $attr['is_mp3'] ? '==' : '!=';
-               $if[] = '$_ctx->attachments->type '.$sign.' "audio/mpeg3"';
+               $if[] = '$attach_f->type '.$sign.' "audio/mpeg3"';
           }
           
@@ -113 +109 @@
                $sign = (boolean) $attr['is_flv'] ? '' : '!';
                $if[] = $sign.
-                    '($_ctx->attachments->type == "video/x-flv" || '.
-                    '$_ctx->attachments->type == "video/mp4" || '.
-                    '$_ctx->attachments->type == "video/x-m4v")';
+                    '($attach_f->type == "video/x-flv" || '.
+                    '$attach_f->type == "video/mp4" || '.
+                    '$attach_f->type == "video/x-m4v")';
           }
           
@@ -131 +127 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->attachments->type').'; ?>';
+          return '<?php echo '.sprintf($f,'$attach_f->type').'; ?>';
      }
      
@@ -140 +136 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->attachments->media_type').'; ?>';
+          return '<?php echo '.sprintf($f,'$attach_f->media_type').'; ?>';
      }
      
@@ -149 +145 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->attachments->basename').'; ?>';
+          return '<?php echo '.sprintf($f,'$attach_f->basename').'; ?>';
      }
      
@@ -162 +158 @@
           $f = $GLOBALS['core']->tpl->getFilters($attr);
           if (!empty($attr['full'])) {
-               return '<?php echo '.sprintf($f,'$_ctx->attachments->size').'; ?>';
-          }
-          return '<?php echo '.sprintf($f,'files::size($_ctx->attachments->size)').'; ?>';
+               return '<?php echo '.sprintf($f,'$attach_f->size').'; ?>';
+          }
+          return '<?php echo '.sprintf($f,'files::size($attach_f->size)').'; ?>';
      }
      
@@ -173 +169 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->attachments->media_title').'; ?>';
+          return '<?php echo '.sprintf($f,'$attach_f->media_title').'; ?>';
      }
      
@@ -184 +180 @@
           return
           '<?php '.
-          'if (isset($_ctx->attachments->media_thumb[\'sq\'])) {'.
-               'echo '.sprintf($f,'$_ctx->attachments->media_thumb[\'sq\']').';'.
+          'if (isset($attach_f->media_thumb[\'sq\'])) {'.
+               'echo '.sprintf($f,'$attach_f->media_thumb[\'sq\']').';'.
           '}'.
           '?>';
@@ -196 +192 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$_ctx->attachments->file_url').'; ?>';
+          return '<?php echo '.sprintf($f,'$attach_f->file_url').'; ?>';
      }