IF tag no longer short-circuits

[(none)]

It looks like {% if %} with OR or AND no longer short circuits under 1.2-beta-1.

class Page(models.Model):

...
def beTrue(self):

print "BEING TRUE"
return True

def beFalse(self):

print "BEING FALSE"
return False

{% if page.beTrue or page.beFalse %}

HELLO

{% endif %}

Under 1.1.1, using manage.py runserver, I will only see "BEING TRUE" printed for the above snippet. Under 1.2-beta-1, I see both BEING TRUE and BEING FALSE.

Similarly,

{% if page.beFalse and page.beTrue %}

HELLO

{% endif %}

will produce only "BEING FALSE" under 1.1.1, but both BEING FALSE and BEING TRUE under 1.2-beta-1.

[anonymous]

I didn't realize that the e-mail address it requests is displayed publicly. How can I remove that?

[Alex Gaynor]

I removed your email Jerry.

[anonymous]

Thanks, Alex, but the problem has become recursive--my address now appears in your change history, where it's still public. How can I get rid of it completely?

[Alex Gaynor]

Unfortunately if I remove the change in the admin it restores the original field. Sorry this is beyond my knowledge at this point.

[Russell Keith-Magee]

(In [13001]) Fixed #13373 -- Ensured that {% if %} statements will short circuit template logic and not evaluate clauses that don't require evaluation. Thanks to Jerry Stratton for the report.

[Jacob]

Milestone 1.2 deleted