BitKeeper patch
Michael Haertl <[email protected]> Tue, 28 Sep 2004 11:38:51 +0200
| Newsgroups | gmane.comp.cms.xaraya.patches |
|---|---|
| Message-ID | <[email protected]> |
This BitKeeper patch contains the following changesets: [email protected]|ChangeSet|20040927190152|45697 [email protected]|ChangeSet|20040927190051|47642 [email protected]|ChangeSet|20040915112633|53302 [email protected]|ChangeSet|20040915111808|20816 # ID: [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b # User: mike # Host: noc.emiga.de # Root: /var/www/xaraya/modules/stable # Patch vers: 1.3 # Patch type: REGULAR == ChangeSet == [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b jojodee-CZ0/[email protected]|ChangeSet|20040906161109|32021 D 1.1181.2.1 04/09/15 13:18:08+02:00 [email protected] +9 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Many files: c Added summary bypassing feature c xarsetup.php: c Added summary bypassing feature K 20816 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|articles/downloads.xml|20040703130212|57377|b69c8e8d [email protected]|articles/downloads.xml|20040915111341|11996 > BK|html/modules/articles/pninit.php|19700101030959|00363|366bd3dda1b50afa [email protected]|articles/xarinit.php|20040915104246|04440 > [email protected]|html/modules/articles/xarsetup.php|20030420165229|44403|f283f3ce [email protected]|articles/xarsetup.php|20040915104427|27898 > [email protected]|html/modules/articles/xaradmin/modifyconfig.php|20030529190915|13472|f472c85391ca7356 [email protected]|articles/xaradmin/modifyconfig.php|20040915104504|16307 > [email protected]|html/modules/articles/xaradmin/pubtypes.php|20030529190915|14925|206ec22e847a3468 [email protected]|articles/xaradmin/pubtypes.php|20040915104518|56396 > [email protected]|html/modules/articles/xaradmin/updateconfig.php|20030529190915|15826|f28d342721dcf4ca [email protected]|articles/xaradmin/updateconfig.php|20040915104545|01618 > BK|html/modules/articles/pntemplates/admin-modifyconfig.pnd|19700101030959|00389|7937aaa14e9c0968 [email protected]|articles/xartemplates/admin-modifyconfig.xd|20040915104701|59847 > [email protected]|html/modules/articles/xaruser/view.php|20030529190915|23956|86c1fb256211181e [email protected]|articles/xaruser/view.php|20040915104741|01410 > [email protected]|BitKeeper/etc/logging_ok|20020928141157|31740|a891b4fe9b65f332 [email protected]|BitKeeper/etc/logging_ok|20040915111807|58224 jojodee-CZ0/[email protected]|ChangeSet|20040915105508|63991 D 1.1207 04/09/15 13:26:33+02:00 [email protected] +1 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Merge http://xaraya.com:15000/modules/stable c into noc.emiga.de:/var/www/xaraya/modules/stable i [email protected]|ChangeSet|20040915111808|20816 K 53302 M [email protected]|ChangeSet|20040915111808|20816 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|BitKeeper/etc/logging_ok|20020928141157|31740|a891b4fe9b65f332 [email protected]|BitKeeper/etc/logging_ok|20040915112626|60061 [email protected]|ChangeSet|20040915112633|53302 D 1.1208 04/09/27 21:00:51+02:00 [email protected] +5 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Many files: c See Bug #3398 K 47642 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|subitems/xaradmin/item_delete.php|20030902154502|21212|5aafa9fc [email protected]|subitems/xaradmin/item_delete.php|20040927185643|54463 > [email protected]|subitems/xaradmin/item_modify.php|20030902154502|60266|5ab3d81a [email protected]|subitems/xaradmin/item_modify.php|20040927185709|47427 > [email protected]|subitems/xaradmin/item_new.php|20030902154503|43155|5ac5d023 [email protected]|subitems/xaradmin/item_new.php|20040927185742|50023 > [email protected]|subitems/xaruser/hook_item_modify.php|20030902154507|62931|5bb8c958 [email protected]|subitems/xaruser/hook_item_modify.php|20040927185744|21899 > [email protected]|subitems/xaruser/hook_item_new.php|20030902154507|30695|5bbce4cb [email protected]|subitems/xaruser/hook_item_new.php|20040927185745|20745 [email protected]|ChangeSet|20040927190051|47642 D 1.1209 04/09/27 21:01:52+02:00 [email protected] +2 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Merge http://xaraya.com:15000/modules/stable c into noc.emiga.de:/var/www/xaraya/modules/stable i ccorliss-tp0iMJ/[email protected]|ChangeSet|20040915174250|57644 i ccorliss-tp0iMJ/[email protected]|ChangeSet|20040915174502|57646 i ccorliss-tp0iMJ/[email protected]|ChangeSet|20040915174714|57275 i ccorliss-tp0iMJ/[email protected]|ChangeSet|20040915194228|57273 i [email protected]|ChangeSet|20040915213713|53671 i jojodee-CZ0/[email protected]|ChangeSet|20040916152612|53675 i [email protected]|ChangeSet|20040916154834|52925 i [email protected]|ChangeSet|20040916154953|52932 i [email protected]|ChangeSet|20040916192435|56540 i [email protected]|ChangeSet|20040916194912|56551 i [email protected]|ChangeSet|20040916233708|35311 i [email protected]|ChangeSet|20040916234820|36566 i [email protected]|ChangeSet|20040917004519|52697 i [email protected]|ChangeSet|20040917010153|53558 i [email protected]|ChangeSet|20040917161210|53559 i [email protected]|ChangeSet|20040917161641|28861 i [email protected]|ChangeSet|20040917201137|28869 i jojodee-CZ0/[email protected]|ChangeSet|20040918113516|29980 i [email protected]|ChangeSet|20040918124459|29992 i [email protected]|ChangeSet|20040918175054|37394 i [email protected]|ChangeSet|20040918192022|37411 i [email protected]|ChangeSet|20040918215812|38980 i [email protected]|ChangeSet|20040918222014|49923 i jojodee-CZ0/[email protected]|ChangeSet|20040919025505|49905 i jojodee-CZ0/[email protected]|ChangeSet|20040919031745|01351 i jojodee-CZ0/[email protected]|ChangeSet|20040919033501|01377 i [email protected]|ChangeSet|20040919105517|04739 i jojodee-CZ0/[email protected]|ChangeSet|20040919133059|04727 i [email protected]|ChangeSet|20040919141238|10837 i jojodee-CZ0/[email protected]|ChangeSet|20040920041033|10795 i jojodee-CZ0/[email protected]|ChangeSet|20040920042558|10791 i jojodee-CZ0/[email protected]|ChangeSet|20040920094454|10804 i jojodee-CZ0/[email protected]|ChangeSet|20040921040514|10006 i jojodee-CZ0/[email protected]|ChangeSet|20040921040544|10002 i [email protected]|ChangeSet|20040921170543|47013 i [email protected]|ChangeSet|20040921200301|01818 i [email protected]|ChangeSet|20040921203039|52525 i caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|ChangeSet|20040921205716|52494 i [email protected]|ChangeSet|20040922155050|52473 i caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|ChangeSet|20040922205504|53779 i caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|ChangeSet|20040922210518|54331 i [email protected]|ChangeSet|20040923002618|53188 i [email protected]|ChangeSet|20040923041425|55216 i jojodee-CZ0/[email protected]|ChangeSet|20040923052300|55203 i [email protected]|ChangeSet|20040923105641|55228 i nuncanada@ng0.(none)|ChangeSet|20040923182339|55242 i nuncanada@ng0.(none)|ChangeSet|20040923182651|55242 i nuncanada@ng0.(none)|ChangeSet|20040923182817|55252 i [email protected]|ChangeSet|20040923182818|56827 i caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|ChangeSet|20040923234352|11873 i caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|ChangeSet|20040923235152|11880 i [email protected]|ChangeSet|20040924012910|10998 i [email protected]|ChangeSet|20040925014743|10491 i [email protected]|ChangeSet|20040925054621|10561 i [email protected]|ChangeSet|20040925055040|10585 i [email protected]|ChangeSet|20040925161210|17912 i [email protected]|ChangeSet|20040925193639|55144 i voll-/[email protected]|ChangeSet|20040926090436|55124 i John.Cox@mcnabb.|ChangeSet|20040926141409|56104 i John.Cox@mcnabb.|ChangeSet|20040927103836|65068 i John.Cox@mcnabb.|ChangeSet|20040927105219|65030 i jojodee-CZ0/[email protected]|ChangeSet|20040927173331|63541 i jojodee-CZ0/[email protected]|ChangeSet|20040927173512|64350 i jojodee-CZ0/[email protected]|ChangeSet|20040927174850|64433 i ccorliss-tp0iMJ/[email protected]|ChangeSet|20040927182041|65206 i caveman-bbP6X+ZHlj22nSIwn8tFp+x8cNe9sq/[email protected]|ChangeSet|20040927185505|65241 i jojodee-CZ0/[email protected]|ChangeSet|20040927185717|65229 K 45697 M jojodee-CZ0/[email protected]|ChangeSet|20040927185717|65229 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|subitems/xaruser/hook_item_modify.php|20030902154507|62931|5bb8c958 [email protected]|subitems/xaruser/hook_item_modify.php|20040927190150|40069 > [email protected]|subitems/xaruser/hook_item_new.php|20030902154507|30695|5bbce4cb [email protected]|subitems/xaruser/hook_item_new.php|20040927190150|20735 == articles/xarinit.php == BK|html/modules/articles/pninit.php|19700101030959|00363|366bd3dda1b50afa nuncanada@ng0.(none)|articles/xarinit.php|20040823201450|65521 D 1.87 04/09/15 12:42:46+02:00 [email protected] +0 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypassing feature K 4440 O -rw-rw-r-- P articles/xarinit.php ------------------------------------------------ == articles/xartemplates/admin-modifyconfig.xd == BK|html/modules/articles/pntemplates/admin-modifyconfig.pnd|19700101030959|00389|7937aaa14e9c0968 [email protected]|articles/xartemplates/admin-modifyconfig.xd|20040820174707|34609 D 1.49 04/09/15 12:47:01+02:00 [email protected] +5 -1 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypassing feature K 59847 O -rw-rw-r-- P articles/xartemplates/admin-modifyconfig.xd ------------------------------------------------ I225 4 <td><label for="bypasssummary"><xar:mlstring>Bypass summary page if only one article in category/pubtype</xar:mlstring> <i>($bypasssummary)</i></label></td> <td><input type="checkbox" name="bypasssummary" id="bypasssummary" value="1" #$bypasssummary# /></td> </tr> <tr> D296 1 I296 1 </div> == articles/xarsetup.php == [email protected]|html/modules/articles/xarsetup.php|20030420165229|44403|f283f3ce [email protected]|articles/xarsetup.php|20040702143414|02419 D 1.13 04/09/15 12:44:27+02:00 [email protected] +9 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypasing feature K 27898 O -rw-rw-rw- P articles/xarsetup.php ------------------------------------------------ I321 1 'bypasssummary' => 0, I348 1 'bypasssummary' => 0, I373 1 'bypasssummary' => 0, I398 1 'bypasssummary' => 0, I423 1 'bypasssummary' => 0, I448 1 'bypasssummary' => 0, I473 1 'bypasssummary' => 0, I498 1 'bypasssummary' => 0, I523 1 'bypasssummary' => 0, == subitems/xaradmin/item_delete.php == [email protected]|subitems/xaradmin/item_delete.php|20030902154502|21212|5aafa9fc [email protected]|subitems/xaradmin/item_delete.php|20040807182552|27256 D 1.3 04/09/27 20:56:43+02:00 [email protected] +11 -3 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c See Bug #3398 K 54463 O -rw-rw-rw- P subitems/xaradmin/item_delete.php ------------------------------------------------ I21 6 $param['module'] = $object['moduleid']; $param['objectid'] = $objectid; \ // get object link info for this item if(!$ddobjectlink = xarModAPIFunc('subitems','user','ddobjectlink_get',$param)) return; \ I51 4 $template = $object->name; if(!empty($ddobjectlink['template'])) $template = $ddobjectlink['template']; \ D57 3 I59 1 return xarTplModule('subitems','admin','item_delete',$data,$template); == subitems/xaradmin/item_modify.php == [email protected]|subitems/xaradmin/item_modify.php|20030902154502|60266|5ab3d81a [email protected]|subitems/xaradmin/item_modify.php|20040807182552|16869 D 1.3 04/09/27 20:57:09+02:00 [email protected] +14 -3 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c See Bug #3398 K 47427 O -rw-rw-rw- P subitems/xaradmin/item_modify.php ------------------------------------------------ I21 7 \ $param['module'] = $object['moduleid']; $param['objectid'] = $objectid; \ // get object link info for this item if(!$ddobjectlink = xarModAPIFunc('subitems','user','ddobjectlink_get',$param)) return; \ I47 4 $template = $object->name; if(!empty($ddobjectlink['template'])) $template = $ddobjectlink['template']; \ D53 3 I55 3 $data['_bl_template'] = $template; return xarTplModule('subitems','admin','item_modify',$data,$template); == subitems/xaradmin/item_new.php == [email protected]|subitems/xaradmin/item_new.php|20030902154503|43155|5ac5d023 [email protected]|subitems/xaradmin/item_new.php|20040807182552|23103 D 1.3 04/09/27 20:57:42+02:00 [email protected] +11 -2 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c See Bug #3398 K 50023 O -rw-rw-rw- P subitems/xaradmin/item_new.php ------------------------------------------------ I20 6 $param['module'] = $object['moduleid']; $param['objectid'] = $objectid; \ // get object link info for this item if(!$ddobjectlink = xarModAPIFunc('subitems','user','ddobjectlink_get',$param)) return; \ I48 4 $template = $object->name; if(!empty($ddobjectlink['template'])) $template = $ddobjectlink['template']; \ I53 1 return xarTplModule('subitems','admin','item_new',$data,$template); D55 2 == subitems/xaruser/hook_item_modify.php == [email protected]|subitems/xaruser/hook_item_modify.php|20030902154507|62931|5bb8c958 nuncanada@ng0.(none)|subitems/xaruser/hook_item_modify.php|20040823201543|06280 D 1.4.1.1 04/09/27 20:57:44+02:00 [email protected] +5 -1 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c See Bug #3398 K 21899 O -rw-rw-rw- P subitems/xaruser/hook_item_modify.php ------------------------------------------------ I49 4 $template = $object->name; if(!empty($ddobjectlink['template'])) $template = $ddobjectlink['template']; D58 1 I58 1 return xarTplModule('subitems','user','hook_item_modify',$data,$template); [email protected]|subitems/xaruser/hook_item_modify.php|20040926142948|24450 D 1.7 04/09/27 21:01:50+02:00 [email protected] +0 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Auto merged i [email protected]|subitems/xaruser/hook_item_modify.php|20040927185744|21899 K 40069 M [email protected]|subitems/xaruser/hook_item_modify.php|20040927185744|21899 O -rw-rw-rw- P subitems/xaruser/hook_item_modify.php ------------------------------------------------ == subitems/xaruser/hook_item_new.php == [email protected]|subitems/xaruser/hook_item_new.php|20030902154507|30695|5bbce4cb nuncanada@ng0.(none)|subitems/xaruser/hook_item_new.php|20040823201543|02518 D 1.4.1.1 04/09/27 20:57:45+02:00 [email protected] +6 -1 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c See Bug #3398 K 20745 O -rw-rw-rw- P subitems/xaruser/hook_item_new.php ------------------------------------------------ I25 4 $template = $object->name; if(!empty($ddobjectlink['template'])) $template = $ddobjectlink['template']; \ D27 1 I27 2 $data['_bl_template'] = $template; return xarTplModule('subitems','user','hook_item_new',$data,$template); [email protected]|subitems/xaruser/hook_item_new.php|20040918222002|02508 D 1.6 04/09/27 21:01:50+02:00 [email protected] +0 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Auto merged i [email protected]|subitems/xaruser/hook_item_new.php|20040927185745|20745 K 20735 M [email protected]|subitems/xaruser/hook_item_new.php|20040927185745|20745 O -rw-rw-rw- P subitems/xaruser/hook_item_new.php ------------------------------------------------ == articles/downloads.xml == [email protected]|articles/downloads.xml|20040703130212|57377|b69c8e8d [email protected]|articles/downloads.xml|20040703130213|52470 D 1.2 04/09/15 13:12:27+02:00 [email protected] +1 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b c Added summary bypassing feature K 55827 O -rw-rw-rw- P articles/downloads.xml ------------------------------------------------ I20 1 <bypasssummary>0</bypasssummary> [email protected]|articles/downloads.xml|20040915111227|55827 D 1.3 04/09/15 13:13:41+02:00 [email protected] +0 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypassing feature K 11996 O -rw-rw-rw- P articles/downloads.xml ------------------------------------------------ == articles/xaradmin/modifyconfig.php == [email protected]|html/modules/articles/xaradmin/modifyconfig.php|20030529190915|13472|f472c85391ca7356 [email protected]|articles/xaradmin/modifyconfig.php|20040820174707|01807 D 1.17 04/09/15 12:45:04+02:00 [email protected] +4 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypassing feature K 16307 O -rw-rw-r-- P articles/xaradmin/modifyconfig.php ------------------------------------------------ I47 1 $data['bypasssummary'] = !empty($settings['bypasssummary']) ? 'checked="checked"' : ''; I93 3 } if (!isset($data['bypasssummary'])) { $data['bypasssummary'] = ''; == articles/xaradmin/pubtypes.php == [email protected]|html/modules/articles/xaradmin/pubtypes.php|20030529190915|14925|206ec22e847a3468 [email protected]|articles/xaradmin/pubtypes.php|20040702143414|53277 D 1.17 04/09/15 12:45:18+02:00 [email protected] +1 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypassing feature K 56396 O -rw-rw-r-- P articles/xaradmin/pubtypes.php ------------------------------------------------ I90 1 'bypasssummary' => 0, == articles/xaradmin/updateconfig.php == [email protected]|html/modules/articles/xaradmin/updateconfig.php|20030529190915|15826|f28d342721dcf4ca [email protected]|articles/xaradmin/updateconfig.php|20040820174707|54136 D 1.16 04/09/15 12:45:45+02:00 [email protected] +2 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypassing feature K 1618 O -rw-rw-r-- P articles/xaradmin/updateconfig.php ------------------------------------------------ I31 1 if(!xarVarFetch('bypasssummary', 'isset', $bypasssummary, 0, XARVAR_NOT_REQUIRED)) {return;} I62 1 $settings['bypasssummary'] = $bypasssummary; == articles/xaruser/view.php == [email protected]|html/modules/articles/xaruser/view.php|20030529190915|23956|86c1fb256211181e [email protected]|articles/xaruser/view.php|20040902173744|33355 D 1.61 04/09/15 12:47:41+02:00 [email protected] +10 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Added summary bypassing feature K 1410 O -rw-rw-r-- P articles/xaruser/view.php ------------------------------------------------ I197 8 // bypass summary page if only one article in category/pubtype if (!isset($bypasssummary)) { if (empty($settings['bypasssummary'])) { $bypasssummary = 0; } else { $bypasssummary = 1; } } I539 2 } elseif (count($articles) == 1 && $bypasssummary) { return xarModFunc('articles','user','display',array('aid'=>$articles[0]['aid'],'ptid'=>$articles[0]['pubtypeid'])); == BitKeeper/etc/logging_ok == [email protected]|BitKeeper/etc/logging_ok|20020928141157|31740|a891b4fe9b65f332 [email protected]|BitKeeper/etc/logging_ok|20040901222323|56600 D 1.136.1.1 04/09/15 13:18:07+02:00 [email protected] +1 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c Logging to [email protected] accepted K 58224 O -rw-rw-r-- P BitKeeper/etc/logging_ok ------------------------------------------------ I89 1 [email protected] [email protected]|BitKeeper/etc/logging_ok|20040910012302|58437 D 1.138 04/09/15 13:26:26+02:00 [email protected] +0 -0 B [email protected]|ChangeSet|20020928140945|52607|ce70d3e6fd7d585b C c auto-union i [email protected]|BitKeeper/etc/logging_ok|20040915111807|58224 K 60061 M [email protected]|BitKeeper/etc/logging_ok|20040915111807|58224 O -rw-rw-r-- P BitKeeper/etc/logging_ok ------------------------------------------------ # Patch checksum=69d8b35f