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

Changeset 777


Ignore:
Timestamp:
Nov 19, 2006, 9:11:58 PM (14 years ago)
Author:
takanashi
Message:

trunkからのブランチへのマージ(バグフィックス)

Location:
OpenPNE/branches/takanashi/prj_takanashi
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE/branches/takanashi/prj_takanashi/config.php.sample

    r414 r777  
    286286
    287287// ImageMagick の convertコマンドのパス
    288 //define('IMGMAGICK_APP', '/usr/bin/convert');
     288define('IMGMAGICK_APP', '/usr/bin/convert');
    289289//define('IMGMAGICK_APP', '"C:\Program Files\ImageMagick-6.2.5-Q16\convert"');
    290290
  • OpenPNE/branches/takanashi/prj_takanashi/webapp/lib/db/deprecated_temporary2.php

    r664 r777  
    557557function do_c_event_edit_update_c_commu_topic_comment($c_commu_topic_id, $topic_comment)
    558558{
    559         return db_commu_update_c_commu_topic_comment($c_commu_topic_id, $topic);
     559        return db_commu_update_c_commu_topic_comment($c_commu_topic_id, $topic_comment);
    560560}
    561561
  • OpenPNE/branches/takanashi/prj_takanashi/webapp/lib/util/cache.php

    r669 r777  
    120120function cache_drop_c_commu_topic($c_commu_topic_id)
    121121{
    122     pne_cache_drop('p_c_home_new_topic_comment4c_commu_id', $c_commu_topic_id, 7);
    123     pne_cache_drop('p_c_home_new_topic_comment4c_commu_id', $c_commu_topic_id, 7, 1);
     122    pne_cache_drop('db_commu_new_topic_comment4c_commu_id', $c_commu_topic_id, 7);
     123    pne_cache_drop('db_commu_new_topic_comment4c_commu_id', $c_commu_topic_id, 7, 0);
     124    pne_cache_drop('db_commu_new_topic_comment4c_commu_id', $c_commu_topic_id, 7, 1);
    124125}
    125126
     
    146147/**
    147148 * プロフィール取得のfunction cacheを削除する
     149 * 旧関数名を呼んでいる限り引数の省略はないのでこれで暫定的な対応とする
    148150 */
    149151function cache_drop_c_member_profile($c_member_id)
    150152{
    151     pne_cache_drop(db_member_c_member4c_member_id, $c_member_id);
     153    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id);
     154    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, false, 'public');
     155    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, false, 'friend');
     156    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, false, 'private');
     157    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, true, 'public');
     158    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, true, 'friend');
     159    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, false, true, 'private');
     160    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, false, 'public');
     161    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, false, 'friend');
     162    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, false, 'private');
     163    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, true, 'public');
     164    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, true, 'friend');
     165    pne_cache_drop('db_member_c_member4c_member_id', $c_member_id, true, true, 'private');
    152166    pne_cache_drop('db_member_c_profile_list');
    153167}
  • OpenPNE/branches/takanashi/prj_takanashi/webapp/modules/pc/templates/fh_friend_list_delete_c_friend_confilm.tpl

    r398 r777  
    7272<input type="hidden" name="sessid" value="({$PHPSESSID})">
    7373<input type="hidden" name="target_c_member_id" value="({$target_c_member_id})">
    74 <input type="submit" value=" 外 す ">&nbsp;
     74<input type="submit" class="submit" value=" 外 す ">&nbsp;
    7575</form>
    7676
  • OpenPNE/branches/takanashi/prj_takanashi/webapp_biz/modules/biz/templates/fh_biz_schedule_calendar.tpl

    r495 r777  
    9999({* スケジュール *})
    100100({foreach from=$item.schedule item=item_schedule name=schedule})
     101({* 時間指定変数の初期化 *})
     102({assign var="begin_time_H" value=null})
     103({assign var="begin_time_M" value=null})
     104({assign var="finish_time_H" value=null})
     105({assign var="finish_time_M" value=null})
    101106        ({if !$item_schedule.begin_time})
    102107&nbsp;
Note: See TracChangeset for help on using the changeset viewer.