Commit 7599a8c0 authored by Dries Buytaert's avatar Dries Buytaert
Browse files 

- Changed the order of the checks in node_teaser().  Patch from Kobus.

  (Committing this in order not to break sites later.)
parent 095179ee

modules/node.module

+8 −8
Original line number Diff line number Diff line
@@ -126,14 +126,6 @@ function node_teaser($body) { 
    return $body;

  }



  /*

  ** If we have a short body, return the entire body:

  */



  if (strlen($body) < $size) {

    return $body;

  }



  /*

  ** If a valid delimiter has been specified, use it to

  ** chop of the teaser.  The delimiter can be outside
@@ -145,6 +137,14 @@ function node_teaser($body) { 
    return substr($body, 0, $delimiter);

  }



  /*

  ** If we have a short body, return the entire body:

  */



  if (strlen($body) < $size) {

    return $body;

  }



  /*

  ** In some cases no delimiter has been specified (eg.

  ** when posting using the Blogger API) in which case