Changeset 1611

Show
Ignore:
Timestamp:
04/21/08 12:55:03 (3 months ago)
Author:
Neal
Message:

Fixed search/replace failures in the previous commit.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/punbb-1.3-dev/extras/db_update.php

    r1610 r1611  
    259259function db_seems_utf8() 
    260260{ 
    261         global $db_type, $db; 
     261        global $db_type, $pun_db; 
    262262 
    263263        $seems_utf8 = true; 
    …… 
    291291function convert_table_utf8($table) 
    292292{ 
    293         global $db; 
     293        global $pun_db; 
    294294 
    295295        $types = array( 

  • branches/punbb-1.3-dev/upload/include/cache.php

    r1610 r1611  
    3434function generate_config_cache() 
    3535{ 
    36         global $db; 
     36        global $pun_db; 
    3737 
    3838        // Get the forum config from the DB 
    …… 
    6565function generate_bans_cache() 
    6666{ 
    67         global $db; 
     67        global $pun_db; 
    6868 
    6969        // Get the ban list from the DB 
    …… 
    103103function generate_ranks_cache() 
    104104{ 
    105         global $db; 
     105        global $pun_db; 
    106106 
    107107        // Get the rank list from the DB 
    …… 
    135135function generate_censors_cache() 
    136136{ 
    137         global $db; 
     137        global $pun_db; 
    138138 
    139139        // Get the censor list from the DB 
    …… 
    167167function generate_quickjump_cache($group_id = false) 
    168168{ 
    169         global $db, $lang_common, $pun_url, $pun_config, $pun_user, $base_url; 
     169        global $pun_db, $lang_common, $pun_url, $pun_config, $pun_user, $base_url; 
    170170 
    171171        // If a group_id was supplied, we generate the quickjump cache for that group only 
    …… 
    255255function generate_hooks_cache() 
    256256{ 
    257         global $db, $pun_config, $base_url; 
     257        global $pun_db, $pun_config, $base_url; 
    258258 
    259259        // Get the hooks from the DB 
    …… 
    300300function generate_updates_cache() 
    301301{ 
    302         global $db, $pun_config; 
     302        global $pun_db, $pun_config; 
    303303 
    304304        // Get a list of installed hotfix extensions 

  • branches/punbb-1.3-dev/upload/include/common_admin.php

    r1610 r1611  
    127127function prune($forum_id, $prune_sticky, $prune_date) 
    128128{ 
    129         global $db, $db_type; 
     129        global $pun_db, $db_type; 
    130130 
    131131        // Fetch topics to prune 

  • branches/punbb-1.3-dev/upload/include/email.php

    r1484 r1611  
    4646function is_banned_email($email) 
    4747{ 
    48         global $db, $pun_bans; 
     48        global $pun_db, $pun_bans; 
    4949 
    5050        foreach ($pun_bans as $cur_ban) 

  • branches/punbb-1.3-dev/upload/include/functions.php

    r1610 r1611  
    4242function authenticate_user($user, $password, $password_is_hash = false) 
    4343{ 
    44         global $db, $pun_user; 
     44        global $pun_db, $pun_user; 
    4545 
    4646        ($hook = get_hook('fn_authenticate_user_start')) ? eval($hook) : null; 
    …… 
    8383function cookie_login(&$pun_user) 
    8484{ 
    85         global $db, $db_type, $pun_config, $cookie_name, $cookie_path, $cookie_domain, $cookie_secure, $pun_time_formats, $pun_date_formats; 
     85        global $pun_db, $db_type, $pun_config, $cookie_name, $cookie_path, $cookie_domain, $cookie_secure, $pun_time_formats, $pun_date_formats; 
    8686 
    8787        ($hook = get_hook('fn_cookie_login_start')) ? eval($hook) : null; 
    …… 
    206206function set_default_user() 
    207207{ 
    208         global $db, $db_type, $pun_user, $pun_config; 
     208        global $pun_db, $db_type, $pun_user, $pun_config; 
    209209 
    210210        ($hook = get_hook('fn_set_default_user_start')) ? eval($hook) : null; 
    …… 
    299299function check_bans() 
    300300{ 
    301         global $db, $pun_config, $lang_common, $pun_user, $pun_bans; 
     301        global $pun_db, $pun_config, $lang_common, $pun_user, $pun_bans; 
    302302 
    303303        ($hook = get_hook('fn_check_bans_start')) ? eval($hook) : null; 
    …… 
    380380function update_users_online() 
    381381{ 
    382         global $db, $pun_config, $pun_user; 
     382        global $pun_db, $pun_config, $pun_user; 
    383383 
    384384        $now = time(); 
    …… 
    654654function sync_forum($forum_id) 
    655655{ 
    656         global $db; 
     656        global $pun_db; 
    657657 
    658658        ($hook = get_hook('fn_sync_forum_start')) ? eval($hook) : null; 
    …… 
    707707function sync_topic($topic_id) 
    708708{ 
    709         global $db; 
     709        global $pun_db; 
    710710 
    711711        ($hook = get_hook('fn_sync_topic_start')) ? eval($hook) : null; 
    …… 
    793793function add_user($user_info, &$new_uid) 
    794794{ 
    795         global $db, $base_url, $lang_common, $pun_config, $pun_user, $pun_url; 
     795        global $pun_db, $base_url, $lang_common, $pun_config, $pun_user, $pun_url; 
    796796 
    797797        ($hook = get_hook('fn_add_user_start')) ? eval($hook) : null; 
    …… 
    848848function delete_user($user_id) 
    849849{ 
    850         global $db, $db_type, $pun_config; 
     850        global $pun_db, $db_type, $pun_config; 
    851851 
    852852        ($hook = get_hook('fn_delete_user_start')) ? eval($hook) : null; 
    …… 
    965965function clean_forum_moderators() 
    966966{ 
    967         global $db; 
     967        global $pun_db; 
    968968 
    969969        ($hook = get_hook('fn_clean_forum_moderators_start')) ? eval($hook) : null; 
    …… 
    10311031function delete_orphans() 
    10321032{ 
    1033         global $db; 
     1033        global $pun_db; 
    10341034 
    10351035        ($hook = get_hook('fn_delete_orphans_start')) ? eval($hook) : null; 
    …… 
    10741074function delete_topic($topic_id, $forum_id) 
    10751075{ 
    1076         global $db, $db_type; 
     1076        global $pun_db, $db_type; 
    10771077 
    10781078        ($hook = get_hook('fn_delete_topic_start')) ? eval($hook) : null; 
    …… 
    11391139function delete_post($post_id, $topic_id, $forum_id) 
    11401140{ 
    1141         global $db, $db_type; 
     1141        global $pun_db, $db_type; 
    11421142 
    11431143        ($hook = get_hook('fn_delete_post_start')) ? eval($hook) : null; 
    …… 
    12071207function add_topic($post_info, &$new_tid, &$new_pid) 
    12081208{ 
    1209         global $db, $db_type, $pun_config, $lang_common; 
     1209        global $pun_db, $db_type, $pun_config, $lang_common; 
    12101210 
    12111211        ($hook = get_hook('fn_add_topic_start')) ? eval($hook) : null; 
    …… 
    12801280function add_post($post_info, &$new_pid) 
    12811281{ 
    1282         global $db, $db_type, $pun_config, $lang_common; 
     1282        global $pun_db, $db_type, $pun_config, $lang_common; 
    12831283 
    12841284        ($hook = get_hook('fn_add_post_start')) ? eval($hook) : null; 
    …… 
    13681368function send_subscriptions($post_info, $new_pid) 
    13691369{ 
    1370         global $pun_config, $db, $pun_url, $lang_common; 
     1370        global $pun_config, $pun_db, $pun_url, $lang_common; 
    13711371 
    13721372        ($hook = get_hook('fn_send_subscriptions_start')) ? eval($hook) : null; 
    …… 
    15111511function censor_words($text) 
    15121512{ 
    1513         global $db; 
     1513        global $pun_db; 
    15141514        static $search_for, $replace_with; 
    15151515 
    …… 
    15531553function check_username_dupe($username, $exclude_id = null) 
    15541554{ 
    1555         global $db; 
     1555        global $pun_db; 
    15561556 
    15571557        ($hook = get_hook('fn_check_username_dupe_start')) ? eval($hook) : null; 
    …… 
    15791579function get_title($user) 
    15801580{ 
    1581         global $db, $pun_config, $pun_bans, $lang_common; 
     1581        global $pun_db, $pun_config, $pun_bans, $lang_common; 
    15821582        static $ban_list, $pun_ranks; 
    15831583 
    …… 
    17221722function message($message, $link = '') 
    17231723{ 
    1724         global $db, $pun_url, $lang_common, $pun_config, $base_url, $pun_start, $tpl_main, $pun_user, $pun_page, $pun_updates; 
     1724        global $pun_db, $pun_url, $lang_common, $pun_config, $base_url, $pun_start, $tpl_main, $pun_user, $pun_page, $pun_updates; 
    17251725 
    17261726        ($hook = get_hook('fn_message_start')) ? eval($hook) : null; 
    …… 
    17631763function csrf_confirm_form() 
    17641764{ 
    1765         global $db, $pun_url, $lang_common, $pun_config, $base_url, $pun_start, $tpl_main, $pun_user, $pun_page, $pun_updates; 
     1765        global $pun_db, $pun_url, $lang_common, $pun_config, $base_url, $pun_start, $tpl_main, $pun_user, $pun_page, $pun_updates; 
    17661766 
    17671767        // User pressed the cancel button 
    …… 
    21812181function maintenance_message() 
    21822182{ 
    2183         global $db, $pun_config, $lang_common, $pun_user, $base_url; 
     2183        global $pun_db, $pun_config, $lang_common, $pun_user, $base_url; 
    21842184 
    21852185        ($hook = get_hook('fn_maintenance_message_start')) ? eval($hook) : null; 
    …… 
    22742274function redirect($destination_url, $message) 
    22752275{ 
    2276         global $db, $pun_config, $lang_common, $pun_user, $base_url; 
     2276        global $pun_db, $pun_config, $lang_common, $pun_user, $base_url; 
    22772277 
    22782278        ($hook = get_hook('fn_redirect_start')) ? eval($hook) : null; 
    …… 
    25042504function get_saved_queries() 
    25052505{ 
    2506         global $db, $lang_common; 
     2506        global $pun_db, $lang_common; 
    25072507 
    25082508        // Get the queries so that we can print them out 

  • branches/punbb-1.3-dev/upload/include/search_idx.php

    r1610 r1611  
    8787function update_search_index($mode, $post_id, $message, $subject = null) 
    8888{ 
    89         global $db_type, $db; 
     89        global $db_type, $pun_db; 
    9090 
    9191        // Split old and new post/subject to obtain array of 'words' 
    …… 
    193193function strip_search_index($post_ids) 
    194194{ 
    195         global $db_type, $db; 
     195        global $db_type, $pun_db; 
    196196 
    197197        switch ($db_type)