notice causing warning in rewrite.php

[davidsword]

in wp-login, and other pages in the admin and site - while having debug enabled, multi-site in use, and a url rewrite of: /%postname%/%post_id%/

gives me Notice: Trying to get property of non-object in ..../wp-includes/rewrite.php on line 341 which prints a header output warning crippling the page..

turning debug off hides this. but adding is_object() in line 341 as below:

if ( is_object( $query->post ) && ( $query->is_single || $query->is_page )  )

solves the problem.

(I don't know if this is helpful & what you're suposed to submit to trac, but it's just been bugging me on a lot of sites, thought I'd make a note of it)

[mrmist]

Attached davidsword's suggestion in patch form. Not checked it myself.

[scribu]

Can't reproduce.

[ocean90]

#15771