Merge lp:~leeturner/quam-plures/stub_file_name into lp:quam-plures

[Lee Turner]

http://forums.quamplures.net/viewtopic.php?f=11&t=1160

Changes the filename of the stub file that is created from BlogX.php to urlname.php format.

[EdB (edb)]

Approving, but see http://forums.quamplures.net/viewtopic.php?p=7906#p7906 for an unrelated bug that is fixable in here ... or in another branch

review: Approve

[lp:~leeturner/quam-plures/stub_file_name]

7643. By Lee Turner <email address hidden> on 2012-07-21

Fixed link to create new blog in dashboard

[Lee Turner (leeturner)]

Please update and text again as I have now fixed the create blog link.

[EdB (edb)]

will re-test later - gotta go make some money :)

[Lee Turner (leeturner)]

Cool

Hope the work life is going well for you !

L

[EdB (edb)]

still approved :)

review: Approve

[EdB (edb)]

If no other comments happen soon I'll merge this tomorrow

=== modified file 'qp_inc/collections/collections.ctrl.php'
--- qp_inc/collections/collections.ctrl.php	2010-12-31 12:12:03 +0000
+++ qp_inc/collections/collections.ctrl.php	2012-07-21 16:11:20 +0000
@@ -133,7 +133,7 @@
 			else
 			{ // we are happy :)
 				$file_imploded = implode( '', $file_loaded );
-				$stub_filename = 'blog'.$edited_Blog->ID.'.php';
+				$stub_filename = $edited_Blog->urlname.'.php';
 				$new_file = $basepath.$stub_filename;
 				$f = @fopen( $new_file , 'w' );
 				if( $f == false )

=== modified file 'qp_inc/dashboard/dashboard.ctrl.php'
--- qp_inc/dashboard/dashboard.ctrl.php	2011-11-21 17:17:22 +0000
+++ qp_inc/dashboard/dashboard.ctrl.php	2012-07-21 16:11:20 +0000
@@ -366,7 +366,7 @@
 	}
 	if( $current_User->check_perm( 'blogs', 'create' ) )
 	{
-		echo '<li><a href="'.$dispatcher.'?ctrl=blogs&amp;action=new">'.T_('Create new blog').' &raquo;</a></li>';
+		echo '<li><a href="'.$dispatcher.'?ctrl=collections&amp;action=new">'.T_('Create new blog').' &raquo;</a></li>';
 	}
 	echo '<li><a href="'.$dispatcher.'?ctrl=templates">'.T_('Install a template').' &raquo;</a></li>';
 	echo '<li><a href="'.$dispatcher.'?ctrl=plugins">'.T_('Install a plugin').' &raquo;</a></li>';