Merge lp:~quam-plures-core/quam-plures/default_on_index_fails into lp:quam-plures

[EdB]

Looks like merging a bug fix that changed the same file knocked this out of "request to merge", so I merged the bug fix IN from trunk then restored the 'fix' for the bug linked to this ... then put it back in mergeland (obviously ;) )

[Tilman Blumenbach (tblue)]

Waiting for more feedback. Anyone?

review: Approve

[lp:~quam-plures-core/quam-plures/default_on_index_fails]

7458. By EdB on 2010-04-12

Merging "rename_templates_adm" FROM trunk INTO branch

[Tilman Blumenbach (tblue)]

Great, our valued core team members don't seem to want to participate in this review (I agree it only is a tiny change anyway). I will merge this.

=== modified file 'inc/_blog_main.inc.php'
--- inc/_blog_main.inc.php	2010-04-10 18:56:05 +0000
+++ inc/_blog_main.inc.php	2010-04-12 04:26:23 +0000
@@ -142,7 +142,8 @@
 
 		if( isset( $path_elements[0] )
 				&& ( $path_elements[0] == $Blog->stub
-						|| $path_elements[0] == $Blog->urlname ) )
+						|| $path_elements[0] == $Blog->urlname
+						|| $path_elements[0] == 'index.php' ) )
 		{ // Ignore stub file (if it ends with .php it should already have been filtered out above)
 			array_shift( $path_elements );
 			$Debuglog->add( 'Ignoring stub filename OR blog urlname in extra path info' , 'params' );