Changeset 927:247142804de0

Timestamp:

10/28/12 07:34:51 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add content_only attribute for tpl:EntryFirstImage, fixes #1037

Location:

inc/public

Files:

• class.dc.template.php (modified) (2 diffs)
• lib.tpl.context.php (modified) (2 diffs)

inc/public/class.dc.template.php

@@ -1618 +1618 @@
      with_category  (1|0)          #IMPLIED  -- Search in entry category description if present (default 0)
      no_tag    (1|0)     #IMPLIED  -- Return image URL without HTML tag (default 0)
+     content_only   (1|0)          #IMPLIED  -- Search in content entry only, not in excerpt (default 0)
      >
      */
@@ -1624 +1625 @@
           $size = !empty($attr['size']) ? $attr['size'] : '';
           $class = !empty($attr['class']) ? $attr['class'] : '';
-          $with_category = !empty($attr['with_category']) ? 'true' : 'false';
-          $no_tag = !empty($attr['no_tag']) ? 'true' : 'false';
-          
-          return "<?php echo context::EntryFirstImageHelper('".addslashes($size)."',".$with_category.",'".addslashes($class).",'".$no_tag."'); ?>";
+          $with_category = !empty($attr['with_category']) ? 1 : 0;
+          $no_tag = !empty($attr['no_tag']) ? 1 : 0;
+          $content_only = !empty($attr['content_only']) ? 1 : 0;
+          
+          return "<?php echo context::EntryFirstImageHelper('".addslashes($size)."',".$with_category.",'".addslashes($class)."',".
+               $no_tag.",".$content_only."); ?>";
      }
      

inc/public/lib.tpl.context.php

@@ -341 +341 @@
      
      # First post image helpers
-     public static function EntryFirstImageHelper($size,$with_category,$class="",$no_tag=false)
+     public static function EntryFirstImageHelper($size,$with_category,$class="",$no_tag=false,$content_only=false)
      {
           global $core, $_ctx;
@@ -363 +363 @@
           if ($_ctx->posts)
           {
-               $subject = $_ctx->posts->post_excerpt_xhtml.$_ctx->posts->post_content_xhtml;
+               $subject = ($content_only ? '' : $_ctx->posts->post_excerpt_xhtml).$_ctx->posts->post_content_xhtml;
                if (preg_match_all($pattern,$subject,$m) > 0)
                {