Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21239] branches/experimental/edit_fixup
|
From: <jon...@us...> - 2009-09-03 17:53:21
|
Revision: 21239
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21239&view=rev
Author: jonnybradley
Date: 2009-09-03 17:53:14 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
[MRG] Automatic merge, trunk 21235 to 21238
Modified Paths:
--------------
branches/experimental/edit_fixup/lib/calendar/calendarlib.php
Property Changed:
----------------
branches/experimental/edit_fixup/
branches/experimental/edit_fixup/installer/schema/20081125_tiki_tracker_types_tiki.sql
branches/experimental/edit_fixup/installer/schema/20090513_calendar_priority_tiki.sql
branches/experimental/edit_fixup/installer/schema/20090513_wiki_similar_permission_tiki.sql
branches/experimental/edit_fixup/installer/schema/20090727_category_permissions_tiki.sql
branches/experimental/edit_fixup/installer/schema/20090727_user_votings_index_tiki.sql
branches/experimental/edit_fixup/installer/schema/20090805_kill_newsreader_tiki.sql
branches/experimental/edit_fixup/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
branches/experimental/edit_fixup/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
branches/experimental/edit_fixup/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
branches/experimental/edit_fixup/lib/importer/index.php
branches/experimental/edit_fixup/lib/importer/tikiimporter.php
branches/experimental/edit_fixup/lib/importer/tikiimporter_wiki.php
branches/experimental/edit_fixup/lib/importer/tikiimporter_wiki_mediawiki.php
branches/experimental/edit_fixup/lib/jquery_tiki/
branches/experimental/edit_fixup/lib/search/searchlib-mysql.php
branches/experimental/edit_fixup/lib/search/searchlib-tiki.php
branches/experimental/edit_fixup/lib/test/AllTests.php
branches/experimental/edit_fixup/lib/test/TikiTestCase.php
branches/experimental/edit_fixup/lib/test/core/AllTests.php
branches/experimental/edit_fixup/lib/test/core/Category/
branches/experimental/edit_fixup/lib/test/core/DeclFilter/
branches/experimental/edit_fixup/lib/test/core/JitFilter/
branches/experimental/edit_fixup/lib/test/core/Multilingual/
branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/AllTests.php
branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php
branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php
branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php
branches/experimental/edit_fixup/lib/test/core/Perms/
branches/experimental/edit_fixup/lib/test/core/TikiFilter/
branches/experimental/edit_fixup/lib/test/core/WikiParser/
branches/experimental/edit_fixup/lib/test/core/bootstrap.php
branches/experimental/edit_fixup/lib/test/core/phpunit.xml
branches/experimental/edit_fixup/lib/test/importer/AllTests.php
branches/experimental/edit_fixup/lib/test/importer/fixtures/
branches/experimental/edit_fixup/lib/test/importer/fixtures/index.php
branches/experimental/edit_fixup/lib/test/importer/fixtures/mediawiki_invalid_upload.xml
branches/experimental/edit_fixup/lib/test/importer/index.php
branches/experimental/edit_fixup/lib/test/importer/tikiimporter_test.php
branches/experimental/edit_fixup/lib/test/importer/tikiimporter_testcase.php
branches/experimental/edit_fixup/lib/test/importer/tikiimporter_wiki_mediawiki_test.php
branches/experimental/edit_fixup/lib/test/importer/tikiimporter_wiki_test.php
branches/experimental/edit_fixup/lib/test/index.php
branches/experimental/edit_fixup/lib/wiki-plugins/wikiplugin_mediaplayer.php
branches/experimental/edit_fixup/pics/icons/announce.png
branches/experimental/edit_fixup/pics/icons/announce_new.png
branches/experimental/edit_fixup/pics/icons/hot.png
branches/experimental/edit_fixup/pics/icons/hot_new.png
branches/experimental/edit_fixup/pics/icons/lock_new.png
branches/experimental/edit_fixup/pics/icons/page_new.png
branches/experimental/edit_fixup/pics/icons/sticky.png
branches/experimental/edit_fixup/pics/icons/sticky_new.png
branches/experimental/edit_fixup/styles/strasa/options/mono/pics/
branches/experimental/edit_fixup/templates/
branches/experimental/edit_fixup/tests/test_php_beautifier.php
Property changes on: branches/experimental/edit_fixup
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0:16998-18916
/branches/experimental/declfilter:15787-16031
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/trunk:20923-21128,21216-21235
+ /branches/3.0:16998-18916
/branches/experimental/declfilter:15787-16031
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/trunk:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/installer/schema/20081125_tiki_tracker_types_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002
/trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:20049-20460,20923-21128,21216-21235
+ /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002
/trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/installer/schema/20090513_calendar_priority_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002
/trunk/installer/schema/20090513_calendar_priority_tiki.sql:20049-20460,20923-21128,21216-21235
+ /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002
/trunk/installer/schema/20090513_calendar_priority_tiki.sql:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/installer/schema/20090513_wiki_similar_permission_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002
/trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:20049-20460,20923-21128,21216-21235
+ /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002
/trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/installer/schema/20090727_category_permissions_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/installer/schema/20090727_category_permissions_tiki.sql:20923-21128,21216-21235
+ /trunk/installer/schema/20090727_category_permissions_tiki.sql:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/installer/schema/20090727_user_votings_index_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/installer/schema/20090727_user_votings_index.php:16998-18916
/branches/experimental/declfilter/installer/schema/20090727_user_votings_index.php:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090727_user_votings_index.php:16728-16731,16999-17002
/trunk/installer/schema/20090727_user_votings_index_tiki.sql:20923-21128,21216-21235
+ /branches/3.0/installer/schema/20090727_user_votings_index.php:16998-18916
/branches/experimental/declfilter/installer/schema/20090727_user_votings_index.php:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090727_user_votings_index.php:16728-16731,16999-17002
/trunk/installer/schema/20090727_user_votings_index_tiki.sql:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/installer/schema/20090805_kill_newsreader_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/installer/schema/20090805_kill_newsreader.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20090805_kill_newsreader.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090805_kill_newsreader.sql:16728-16731,16999-17002
/trunk/installer/schema/20090805_kill_newsreader_tiki.sql:20923-21128,21216-21235
+ /branches/3.0/installer/schema/20090805_kill_newsreader.sql:16998-18916
/branches/experimental/declfilter/installer/schema/20090805_kill_newsreader.sql:15787-16031
/branches/experimental/ui-revamp2/installer/schema/20090805_kill_newsreader.sql:16728-16731,16999-17002
/trunk/installer/schema/20090805_kill_newsreader_tiki.sql:20923-21128,21216-21238
Modified: branches/experimental/edit_fixup/lib/calendar/calendarlib.php
===================================================================
--- branches/experimental/edit_fixup/lib/calendar/calendarlib.php 2009-09-03 16:35:27 UTC (rev 21238)
+++ branches/experimental/edit_fixup/lib/calendar/calendarlib.php 2009-09-03 17:53:14 UTC (rev 21239)
@@ -35,6 +35,7 @@
}
$distinct = '';
+ $join_tables = '';
if (!empty($filter)) {
$tmp_mid = array();
foreach ($filter as $type=>$val) {
@@ -60,7 +61,7 @@
$mid .= implode( ' and ', $tmp_mid ) . ')';
}
}
- if (is_array($join_bindvars)) {
+ if (!empty($join_bindvars)) {
$bindvars = array_merge($bindvars, $join_bindvars);
}
Property changes on: branches/experimental/edit_fixup/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:20049-20460,20923-21128,21216-21235
+ /branches/3.0/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:20049-20460,20923-21128,21216-21235
+ /branches/3.0/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:20049-20460,20923-21128,21216-21235
+ /branches/3.0/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/importer/index.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/importer/index.php:20923-21128,21216-21235
+ /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/importer/index.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/importer/tikiimporter.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/TikiImporter.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter.php:20049-20460,20923-21128,21216-21235
+ /branches/3.0/lib/importer/TikiImporter.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter.php:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/importer/tikiimporter_wiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/TikiImporter_Wiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki.php:20049-20460,20923-21128,21216-21235
+ /branches/3.0/lib/importer/TikiImporter_Wiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki.php:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/importer/tikiimporter_wiki_mediawiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/TikiImporter_Wiki_Mediawiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki_Mediawiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki_Mediawiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki_mediawiki.php:20049-20460,20923-21128,21216-21235
+ /branches/3.0/lib/importer/TikiImporter_Wiki_Mediawiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki_Mediawiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki_Mediawiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki_mediawiki.php:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/jquery_tiki
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/jquery_tiki:17151-18916
/branches/experimental/jquery/lib/jquery_tiki:16288-17075
/trunk/lib/jquery_tiki:20049-20460,20923-21128,21216-21235
+ /branches/3.0/lib/jquery_tiki:17151-18916
/branches/experimental/jquery/lib/jquery_tiki:16288-17075
/trunk/lib/jquery_tiki:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/search/searchlib-mysql.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-mysql.php:20206-20460,20923-21128,21216-21235
+ /branches/3.0/lib/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-mysql.php:20206-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/search/searchlib-tiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/search/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/search/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/search/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-tiki.php:20206-20460,20923-21128,21216-21235
+ /branches/3.0/lib/search/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/search/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/search/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-tiki.php:20206-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/AllTests.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002
/trunk/lib/test/AllTests.php:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002
/trunk/lib/test/AllTests.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/TikiTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/TikiTestCase.php:16998-18916
/branches/experimental/declfilter/lib/core/test/TikiTestCase.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/TikiTestCase.php:16728-16731,16999-17002
/trunk/lib/test/TikiTestCase.php:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/TikiTestCase.php:16998-18916
/branches/experimental/declfilter/lib/core/test/TikiTestCase.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/TikiTestCase.php:16728-16731,16999-17002
/trunk/lib/test/TikiTestCase.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/AllTests.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002
/trunk/lib/test/core/AllTests.php:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002
/trunk/lib/test/core/AllTests.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/Category
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/Category:16998-18916
/branches/experimental/declfilter/lib/core/test/Category:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/Category:16728-16731,16999-17002
/trunk/lib/test/core/Category:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/Category:16998-18916
/branches/experimental/declfilter/lib/core/test/Category:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/Category:16728-16731,16999-17002
/trunk/lib/test/core/Category:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/DeclFilter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/DeclFilter:16998-18916
/branches/experimental/declfilter/lib/core/test/DeclFilter:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/DeclFilter:16728-16731,16999-17002
/trunk/lib/test/core/DeclFilter:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/DeclFilter:16998-18916
/branches/experimental/declfilter/lib/core/test/DeclFilter:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/DeclFilter:16728-16731,16999-17002
/trunk/lib/test/core/DeclFilter:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/JitFilter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/JitFilter:16998-18916
/branches/experimental/declfilter/lib/core/test/JitFilter:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/JitFilter:16728-16731,16999-17002
/trunk/lib/test/core/JitFilter:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/JitFilter:16998-18916
/branches/experimental/declfilter/lib/core/test/JitFilter:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/JitFilter:16728-16731,16999-17002
/trunk/lib/test/core/JitFilter:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/Multilingual
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/Multilingual:16998-18916
/branches/experimental/declfilter/lib/core/test/Multilingual:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/Multilingual:16728-16731,16999-17002
/trunk/lib/test/core/Multilingual:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/Multilingual:16998-18916
/branches/experimental/declfilter/lib/core/test/Multilingual:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/Multilingual:16728-16731,16999-17002
/trunk/lib/test/core/Multilingual:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/AllTests.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/Multilingual/Aligner/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/AllTests.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/AllTests.php:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/Multilingual/Aligner/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/AllTests.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/AllTests.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16998-18916
/trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php:20923-21128,21216-21235
/trunk/tiki/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:4-9737
+ /branches/3.0/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16998-18916
/trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:20049-20460
/trunk/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php:20923-21128,21216-21238
/trunk/tiki/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:4-9737
Property changes on: branches/experimental/edit_fixup/lib/test/core/Perms
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/Perms:16998-18916
/branches/experimental/declfilter/lib/core/test/Perms:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/Perms:16728-16731,16999-17002
/trunk/lib/test/core/Perms:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/Perms:16998-18916
/branches/experimental/declfilter/lib/core/test/Perms:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/Perms:16728-16731,16999-17002
/trunk/lib/test/core/Perms:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/TikiFilter
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/TikiFilter:16998-18916
/branches/experimental/declfilter/lib/core/test/TikiFilter:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/TikiFilter:16728-16731,16999-17002
/trunk/lib/test/core/TikiFilter:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/TikiFilter:16998-18916
/branches/experimental/declfilter/lib/core/test/TikiFilter:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/TikiFilter:16728-16731,16999-17002
/trunk/lib/test/core/TikiFilter:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/WikiParser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/WikiParser:16998-18916
/branches/experimental/declfilter/lib/core/test/WikiParser:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/WikiParser:16728-16731,16999-17002
/trunk/lib/test/core/WikiParser:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/WikiParser:16998-18916
/branches/experimental/declfilter/lib/core/test/WikiParser:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/WikiParser:16728-16731,16999-17002
/trunk/lib/test/core/WikiParser:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/bootstrap.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/bootstrap.php:16998-18916
/branches/experimental/declfilter/lib/core/test/bootstrap.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/bootstrap.php:16728-16731,16999-17002
/trunk/lib/test/core/bootstrap.php:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/bootstrap.php:16998-18916
/branches/experimental/declfilter/lib/core/test/bootstrap.php:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/bootstrap.php:16728-16731,16999-17002
/trunk/lib/test/core/bootstrap.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/core/phpunit.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/test/phpunit.xml:16998-18916
/branches/experimental/declfilter/lib/core/test/phpunit.xml:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/phpunit.xml:16728-16731,16999-17002
/trunk/lib/test/core/phpunit.xml:20923-21128,21216-21235
+ /branches/3.0/lib/core/test/phpunit.xml:16998-18916
/branches/experimental/declfilter/lib/core/test/phpunit.xml:15787-16031
/branches/experimental/ui-revamp2/lib/core/test/phpunit.xml:16728-16731,16999-17002
/trunk/lib/test/core/phpunit.xml:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/AllTests.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/test/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/AllTests.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/AllTests.php:16728-16731,16999-17002
/trunk/lib/test/importer/AllTests.php:20923-21128,21216-21235
+ /branches/3.0/lib/importer/test/AllTests.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/AllTests.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/AllTests.php:16728-16731,16999-17002
/trunk/lib/test/importer/AllTests.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/fixtures
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/test/fixtures:16998-18916
/branches/experimental/declfilter/lib/importer/test/fixtures:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/fixtures:16728-16731,16999-17002
/trunk/lib/test/importer/fixtures:20923-21128,21216-21235
+ /branches/3.0/lib/importer/test/fixtures:16998-18916
/branches/experimental/declfilter/lib/importer/test/fixtures:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/fixtures:16728-16731,16999-17002
/trunk/lib/test/importer/fixtures:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/fixtures/index.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/test/importer/fixtures/index.php:20923-21128,21216-21235
+ /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/test/importer/fixtures/index.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/fixtures/mediawiki_invalid_upload.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/test/fixtures/mediawiki_upload.xml:16998-18916
/branches/experimental/declfilter/lib/importer/test/fixtures/mediawiki_upload.xml:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/fixtures/mediawiki_upload.xml:16728-16731,16999-17002
/trunk/lib/test/importer/fixtures/mediawiki_invalid_upload.xml:20923-21128,21216-21235
+ /branches/3.0/lib/importer/test/fixtures/mediawiki_upload.xml:16998-18916
/branches/experimental/declfilter/lib/importer/test/fixtures/mediawiki_upload.xml:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/fixtures/mediawiki_upload.xml:16728-16731,16999-17002
/trunk/lib/test/importer/fixtures/mediawiki_invalid_upload.xml:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/index.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/test/importer/index.php:20923-21128,21216-21235
+ /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/test/importer/index.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/tikiimporter_test.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/test/tikiimporter_test.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/tikiimporter_test.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_test.php:16728-16731,16999-17002
/trunk/lib/test/importer/tikiimporter_test.php:20923-21128,21216-21235
+ /branches/3.0/lib/importer/test/tikiimporter_test.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/tikiimporter_test.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_test.php:16728-16731,16999-17002
/trunk/lib/test/importer/tikiimporter_test.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/tikiimporter_testcase.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/test/tikiimporter_testcase.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/tikiimporter_testcase.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_testcase.php:16728-16731,16999-17002
/trunk/lib/test/importer/tikiimporter_testcase.php:20923-21128,21216-21235
+ /branches/3.0/lib/importer/test/tikiimporter_testcase.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/tikiimporter_testcase.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_testcase.php:16728-16731,16999-17002
/trunk/lib/test/importer/tikiimporter_testcase.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/tikiimporter_wiki_mediawiki_test.php
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/lib/test/importer/tikiimporter_wiki_mediawiki_test.php:20923-21128,21216-21235
+ /trunk/lib/test/importer/tikiimporter_wiki_mediawiki_test.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/importer/tikiimporter_wiki_test.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/test/tikiimporter_wiki_test.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/tikiimporter_wiki_test.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_wiki_test.php:16728-16731,16999-17002
/trunk/lib/test/importer/tikiimporter_wiki_test.php:20923-21128,21216-21235
+ /branches/3.0/lib/importer/test/tikiimporter_wiki_test.php:16998-18916
/branches/experimental/declfilter/lib/importer/test/tikiimporter_wiki_test.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_wiki_test.php:16728-16731,16999-17002
/trunk/lib/test/importer/tikiimporter_wiki_test.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/test/index.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/test/index.php:20923-21128,21216-21235
+ /branches/3.0/lib/index.php:16998-18916
/branches/experimental/declfilter/lib/index.php:15787-16031
/branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002
/trunk/lib/test/index.php:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/lib/wiki-plugins/wikiplugin_mediaplayer.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-18916
/trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:20049-20460,20923-21128,21216-21235
/trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737
+ /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-18916
/trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:20049-20460,20923-21128,21216-21238
/trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737
Property changes on: branches/experimental/edit_fixup/pics/icons/announce.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/announce.png:15787-16031
/trunk/pics/icons/announce.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/announce.png:15787-16031
/trunk/pics/icons/announce.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/pics/icons/announce_new.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/announce_new.png:15787-16031
/trunk/pics/icons/announce_new.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/announce_new.png:15787-16031
/trunk/pics/icons/announce_new.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/pics/icons/hot.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/hot.png:15787-16031
/trunk/pics/icons/hot.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/hot.png:15787-16031
/trunk/pics/icons/hot.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/pics/icons/hot_new.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/hot_new.png:15787-16031
/trunk/pics/icons/hot_new.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/hot_new.png:15787-16031
/trunk/pics/icons/hot_new.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/pics/icons/lock_new.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/locked_new.png:15787-16031
/trunk/pics/icons/lock_new.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/locked_new.png:15787-16031
/trunk/pics/icons/lock_new.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/pics/icons/page_new.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/page_new.png:15787-16031
/trunk/pics/icons/page_new.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/page_new.png:15787-16031
/trunk/pics/icons/page_new.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/pics/icons/sticky.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/sticky.png:15787-16031
/trunk/pics/icons/sticky.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/sticky.png:15787-16031
/trunk/pics/icons/sticky.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/pics/icons/sticky_new.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/declfilter/img/silk/sticky_new.png:15787-16031
/trunk/pics/icons/sticky_new.png:18953-20428,20611-20670,20923-21128,21216-21235
+ /branches/experimental/declfilter/img/silk/sticky_new.png:15787-16031
/trunk/pics/icons/sticky_new.png:18953-20428,20611-20670,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/styles/strasa/options/mono/pics
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/styles/strasa/options/mono/pics:18696-18916
/trunk/styles/strasa/options/mono/pics:20049-20460,20923-21128,21216-21235
+ /branches/3.0/styles/strasa/options/mono/pics:18696-18916
/trunk/styles/strasa/options/mono/pics:20049-20460,20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/templates
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/experimental/perms-take2/templates:20049-20462
/trunk/templates:20923-21128,21216-21235
+ /branches/experimental/perms-take2/templates:20049-20462
/trunk/templates:20923-21128,21216-21238
Property changes on: branches/experimental/edit_fixup/tests/test_php_beautifier.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/test_php_beautifier.php:16998-18916
/branches/experimental/declfilter/test_php_beautifier.php:15787-16031
/branches/experimental/ui-revamp2/test_php_beautifier.php:16728-16731,16999-17002
/trunk/tests/test_php_beautifier.php:20049-20460,20923-21128,21216-21235
+ /branches/3.0/test_php_beautifier.php:16998-18916
/branches/experimental/declfilter/test_php_beautifier.php:15787-16031
/branches/experimental/ui-revamp2/test_php_beautifier.php:16728-16731,16999-17002
/trunk/tests/test_php_beautifier.php:20049-20460,20923-21128,21216-21238
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|