Menu
▾
▴
[Tikiwiki-cvs] tiki tiki-cookie-jar.php,1.1,1.2 get_strings.php,1.37,1.38 messu-compose.php,1.19,1.20 tiki-categpermissions.php,1.9,1.10 tiki-edit_article.php,1.44,1.45 tiki-edit_submission.php,1.40,1.41 tiki-shoutbox.php,1.10,1.11 tiki-slideshow.php,1.16,1.17 tiki-user_preferences.php,1.55,1.56
|
From: <dam...@us...> - 2004-07-08 12:51:13
|
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12502 Modified Files: get_strings.php messu-compose.php tiki-categpermissions.php tiki-edit_article.php tiki-edit_submission.php tiki-shoutbox.php tiki-slideshow.php tiki-user_preferences.php Added Files: tiki-cookie-jar.php Log Message: Instant-Auto-Merge from BRANCH-1-9 to HEAD Index: get_strings.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/get_strings.php,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- get_strings.php 6 Jun 2004 08:42:45 -0000 1.37 +++ get_strings.php 8 Jul 2004 12:50:32 -0000 1.38 @@ -206,12 +206,12 @@ ## When collecting files we need to add a file since the directory which it ## is placed in is excluded. We should keep hardwiring to a minimum. -## In a normal case a file that should be translated shuold not exist in +## In a normal case a file that should be translated should not exist in ## a (sub)directory that is excluded. In this (unfortunate) case it seems that -## the file is placed in a logical location. +## the files are placed in a logical location. collect_files ('.'); hardwire_file ('./lang/langmapping.php'); - +hardwire_file ('./img/flags/flagnames.php'); $oldEndMarker = '##end###'; Index: messu-compose.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/messu-compose.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- messu-compose.php 27 Jun 2004 03:05:41 -0000 1.19 +++ messu-compose.php 8 Jul 2004 12:50:32 -0000 1.20 @@ -85,9 +85,9 @@ } // Parse the to, cc and bcc fields into an array - $arr_to = explode(',', $_REQUEST['to']); - $arr_cc = explode(',', $_REQUEST['cc']); - $arr_bcc = explode(',', $_REQUEST['bcc']); + $arr_to = preg_split('/\s*(,|\s)\s*/', $_REQUEST['to']); + $arr_cc = preg_split('/\s*(,|\s)\s*/', $_REQUEST['cc']); + $arr_bcc = preg_split('/\s*(,|\s)\s*/', $_REQUEST['bcc']); // Remove invalid users from the to, cc and bcc fields $users = array(); Index: tiki-categpermissions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-categpermissions.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- tiki-categpermissions.php 18 Jun 2004 20:55:12 -0000 1.9 +++ tiki-categpermissions.php 8 Jul 2004 12:50:33 -0000 1.10 @@ -1,6 +1,6 @@ <?php -// $Header: +// $Header$ // Copyright (c) 2002-2004, Luis Argerich, Garland Foster, Eduardo Polidor, et. al. // All Rights Reserved. See copyright.txt for details and a complete list of authors. Index: tiki-edit_article.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_article.php,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- tiki-edit_article.php 16 Jun 2004 10:54:34 -0000 1.44 +++ tiki-edit_article.php 8 Jul 2004 12:50:33 -0000 1.45 @@ -392,7 +392,7 @@ $smarty->assign_by_ref('topics', $topics); // get list of valid types -$types = $artlib->list_types(); +$types = $artlib->list_types_byname(); $smarty->assign_by_ref('types', $types); if ($feature_cms_templates == 'y' && $tiki_p_use_content_templates == 'y') { Index: tiki-edit_submission.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_submission.php,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- tiki-edit_submission.php 21 May 2004 09:18:33 -0000 1.40 +++ tiki-edit_submission.php 8 Jul 2004 12:50:33 -0000 1.41 @@ -401,7 +401,7 @@ $topics = $artlib->list_topics(); $smarty->assign_by_ref('topics', $topics); -$types = $artlib->list_types(); +$types = $artlib->list_types_byname(); $smarty->assign_by_ref('types', $types); if ($feature_cms_templates == 'y' && $tiki_p_use_content_templates == 'y') { Index: tiki-shoutbox.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-shoutbox.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- tiki-shoutbox.php 31 Mar 2004 07:38:41 -0000 1.10 +++ tiki-shoutbox.php 8 Jul 2004 12:50:33 -0000 1.11 @@ -69,7 +69,7 @@ if ($tiki_p_post_shoutbox == 'y') { if (isset($_REQUEST["save"])) { check_ticket('shoutbox'); - $shoutboxlib->replace_shoutbox($_REQUEST["msgId"], $user, $_REQUEST["message"]); + $shoutboxlib->replace_shoutbox($_REQUEST["msgId"], $_REQUEST["user"], $_REQUEST["message"]); $smarty->assign("msgId", '0'); $smarty->assign('message', ''); Index: tiki-slideshow.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-slideshow.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- tiki-slideshow.php 1 Jul 2004 19:06:16 -0000 1.16 +++ tiki-slideshow.php 8 Jul 2004 12:50:33 -0000 1.17 @@ -109,6 +109,7 @@ // Get page data $info = $tikilib->get_page_info($page); +$smarty->assign('page_info', $info); // Verify lock status if ($info["flag"] == 'L') { Index: tiki-user_preferences.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_preferences.php,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- tiki-user_preferences.php 1 Jul 2004 19:11:19 -0000 1.55 +++ tiki-user_preferences.php 8 Jul 2004 12:50:33 -0000 1.56 @@ -361,7 +361,7 @@ $usertrackerId = false; $useritemId= false; if ($userTracker == 'y') { - $re = $userlib->get_usertracker($userinfo['groups']); + $re = $userlib->get_usertracker($userwatch); if (isset($re['usersTrackerId']) and $re['usersTrackerId']) { include_once('lib/trackers/trackerlib.php'); $info = $trklib->get_item_id($re['usersTrackerId'],'Login',$userwatch); |