[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[47812] trunk

[<jon...@us...>]

Revision: 47812
          http://sourceforge.net/p/tikiwiki/code/47812
Author:   jonnybradley
Date:     2013-09-30 21:09:17 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
[MRG] Automatic merge, branches/12.x 47807 to 47811

Modified Paths:
--------------
    trunk/lib/setup/wiki.php
    trunk/tests/testfile.txt

Property Changed:
----------------
    trunk/

Index: trunk
===================================================================
--- trunk	2013-09-30 21:07:50 UTC (rev 47811)
+++ trunk	2013-09-30 21:09:17 UTC (rev 47812)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,6 ##
 /branches/10.x:43596-44410,44444-44836,44907
 /branches/11.x:45702-47762
+/branches/12.x:47808-47811
 /branches/3.0:16998-18916
 /branches/4.x:22817-23908
 /branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/lib/setup/wiki.php
===================================================================
--- trunk/lib/setup/wiki.php	2013-09-30 21:07:50 UTC (rev 47811)
+++ trunk/lib/setup/wiki.php	2013-09-30 21:09:17 UTC (rev 47812)
@@ -75,7 +75,7 @@
 	if ($check && !$tikilib->page_exists($_REQUEST['page'])) {
 
 		$homePageLang = $prefs['language'];
-		$profilesLink = 'tiki-admin.php?profile=&categories%5B%5D=11.x&categories%5B%5D=Featured+profiles' .
+		$profilesLink = 'tiki-admin.php?profile=&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles' .
 										'&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2';
 
 		// Default HomePage content

Modified: trunk/tests/testfile.txt
===================================================================
--- trunk/tests/testfile.txt	2013-09-30 21:07:50 UTC (rev 47811)
+++ trunk/tests/testfile.txt	2013-09-30 21:09:17 UTC (rev 47812)
@@ -17,3 +17,4 @@
 start merge for 9.x
 on the old sf.net repo (just checking)
 test
+check merge for 12.x

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.