BitKeeper patch

This BitKeeper patch contains the following changesets:
[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

== 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,

== 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=07942889