ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 5886


Ignore:
Timestamp:
Mar 20, 2008, 12:08:11 AM (14 years ago)
Author:
ebihara
Message:

#2105:merged r5883:5885

Location:
OpenPNE/branches/stable-2.10.x/webapp
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • OpenPNE/branches/stable-2.10.x/webapp/lib/db/commu.php

    r5303 r5886  
    25122512        'r_date' => db_now(),
    25132513    );
     2514
    25142515    if ($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['phptype'] == 'pgsql') {
    25152516        $open_date = '0000-01-01';
    25162517        $invite_period = '0000-01-01';
    2517         if (isset($topic['open_date']) && $topic['open_date'] != '') {
    2518             $open_date = $topic['open_date'];
    2519         }
    2520        
    2521         if (isset($topic['invite_period']) && $topic['invite_period'] != '') {
    2522             $invite_period = $topic['invite_period'];
    2523         }
    25242518    } else {
     2519        $open_date = '0000-00-00';
     2520        $invite_period = '0000-00-00';
     2521    }
     2522
     2523    if (isset($topic['open_date']) && $topic['open_date']) {
    25252524        $open_date = $topic['open_date'];
     2525    }
     2526   
     2527    if (isset($topic['invite_period']) && $topic['invite_period']) {
    25262528        $invite_period = $topic['invite_period'];
    25272529    }
     2530
    25282531    if ($data['event_flag']) {
    25292532        $data += array(
    … …  
    26002603        'r_date'      => db_now(),
    26012604    );
     2605
    26022606    if ($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['phptype'] == 'pgsql') {
    26032607        $open_date = '0000-01-01';
    26042608        $invite_period = '0000-01-01';
    2605         if (isset($topic['open_date']) && $topic['open_date'] != '') {
    2606             $open_date = $topic['open_date'];
    2607         }
    2608        
    2609         if (isset($topic['invite_period']) && $topic['invite_period'] != '') {
    2610             $invite_period = $topic['invite_period'];
    2611         }
    26122609    } else {
     2610        $open_date = '0000-00-00';
     2611        $invite_period = '0000-00-00';
     2612    }
     2613
     2614    if (isset($topic['open_date']) && $topic['open_date']) {
    26132615        $open_date = $topic['open_date'];
     2616    }
     2617   
     2618    if (isset($topic['invite_period']) && $topic['invite_period']) {
    26142619        $invite_period = $topic['invite_period'];
    26152620    }
     2621
    26162622    if ($data['event_flag']) {
    26172623        $data += array(

  • OpenPNE/branches/stable-2.10.x/webapp/modules/pc/do/c_event_add_insert_c_commu_topic.php

    r5882 r5886  
    7272        if ($event['invite_period_year'].$event['invite_period_month'].$event['invite_period_day']!="") {
    7373            $invite_period = $event['invite_period_year']."-".$event['invite_period_month']."-".$event['invite_period_day'];
    74         } else {
    75             $invite_period = "0000-00-00";
    7674        }
    7775
Note: See TracChangeset for help on using the changeset viewer.