Rewrote 2 str_replace() calls to one with array()

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index fb60ceb11c45acdbde89baad0bb456837136ef1d..c23039256ff9df505597f1896cdd4477e47be84f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -148,6 +148,7 @@ inc/daily/daily_yoomedia.php svneol=native#text/plain
 inc/databases.php svneol=native#text/plain
 inc/db/.htaccess svneol=native#text/plain
 inc/db/lib-mysql3.php svneol=native#text/plain
+inc/db/lib-mysqli.php svneol=native#text/plain
 inc/db/lib.php svneol=native#text/plain
 inc/debug/.htaccess svneol=native#text/plain
 inc/debug/client/.htaccess svneol=native#text/plain
@@ -258,6 +259,8 @@ inc/extensions/ext-yacy.php svneol=native#text/plain
 inc/extensions/ext-yoomedia.php svneol=native#text/plain
 inc/extensions/forced/.htaccess svneol=native#text/plain
 inc/extensions/forced/mode-setup.php svneol=native#text/plain
+inc/extensions/grade/.htaccess svneol=native#text/plain
+inc/extensions/grade/mode-setup.php svneol=native#text/plain
 inc/extensions/holiday/.htaccess svneol=native#text/plain
 inc/extensions/holiday/mode-update.php svneol=native#text/plain
 inc/extensions/html_mail/.htaccess svneol=native#text/plain
@@ -292,6 +295,8 @@ inc/extensions/user/.htaccess svneol=native#text/plain
 inc/extensions/user/mode-remove.php svneol=native#text/plain
 inc/extensions/user/mode-setup.php svneol=native#text/plain
 inc/extensions/user/mode-update.php svneol=native#text/plain
+inc/extensions/wernis/.htaccess svneol=native#text/plain
+inc/extensions/wernis/mode-update.php svneol=native#text/plain
 inc/filter-functions.php svneol=native#text/plain
 inc/filter/.htaccess svneol=native#text/plain
 inc/filter/_filter.php svneol=native#text/plain
@@ -324,6 +329,7 @@ inc/filter/timezone_filter.php svneol=native#text/plain
 inc/filter/transaction_filter.php svneol=native#text/plain
 inc/filter/uberwach_filter.php svneol=native#text/plain
 inc/filter/user_filter.php svneol=native#text/plain
+inc/filter/wernis_filter.php svneol=native#text/plain
 inc/filters.php svneol=native#text/plain
 inc/fix_filters.php svneol=native#text/plain
 inc/fix_menu.php svneol=native#text/plain
@@ -649,6 +655,7 @@ inc/modules/admin/what-list_grade_data.php svneol=native#text/plain
 inc/modules/admin/what-list_holiday.php svneol=native#text/plain
 inc/modules/admin/what-list_links.php svneol=native#text/plain
 inc/modules/admin/what-list_mods.php svneol=native#text/plain
+inc/modules/admin/what-list_network_api.php svneol=native#text/plain
 inc/modules/admin/what-list_network_array_translation.php svneol=native#text/plain
 inc/modules/admin/what-list_network_data.php svneol=native#text/plain
 inc/modules/admin/what-list_network_request_params.php svneol=native#text/plain
@@ -1425,6 +1432,7 @@ templates/de/html/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_theme_row_404.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user_subids.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user_subids_row.tpl svneol=native#text/plain
@@ -1842,6 +1850,9 @@ templates/de/html/guest/guest_receive_table.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid_hide.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_provider.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_provider_row.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_select.tpl svneol=native#text/plain
 templates/de/html/guest/guest_show_rallye.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_act_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_activate.tpl svneol=native#text/plain
@@ -1866,6 +1877,7 @@ templates/de/html/guest/guest_top10_row_earner.tpl svneol=native#text/plain
 templates/de/html/guest/guest_top10_row_login.tpl svneol=native#text/plain
 templates/de/html/guest/guest_top10_row_refs.tpl svneol=native#text/plain
 templates/de/html/guest/guest_wernis_news.tpl svneol=native#text/plain
+templates/de/html/guest/guest_wernis_registration_form.tpl svneol=native#text/plain
 templates/de/html/impressum.tpl svneol=native#text/plain
 templates/de/html/index.tpl svneol=native#text/plain
 templates/de/html/index_forward.tpl svneol=native#text/plain
@@ -2142,6 +2154,8 @@ templates/de/html/select/select_forced_costs_id_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_costs_id_option.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_costs_visibility_box.tpl svneol=native#text/plain
 templates/de/html/select/select_forced_costs_visibility_option.tpl svneol=native#text/plain
+templates/de/html/select/select_grade_parent_id_box.tpl svneol=native#text/plain
+templates/de/html/select/select_grade_parent_id_option.tpl svneol=native#text/plain
 templates/de/html/select/select_network_box.tpl svneol=native#text/plain
 templates/de/html/select/select_network_configured_box.tpl svneol=native#text/plain
 templates/de/html/select/select_network_configured_option.tpl svneol=native#text/plain
@@ -2251,6 +2265,7 @@ templates/xml/admin/admin_list_forced_ads.xml svneol=native#text/plain
 templates/xml/admin/admin_list_forced_campaigns.xml svneol=native#text/plain
 templates/xml/admin/admin_list_forced_costs.xml svneol=native#text/plain
 templates/xml/admin/admin_list_grade_data.xml svneol=native#text/plain
+templates/xml/admin/admin_list_network_api.xml svneol=native#text/plain
 templates/xml/admin/admin_list_network_query_api_config.xml svneol=native#text/plain
 templates/xml/admin/admin_list_nickname_history.xml svneol=native#text/plain
 templates/xml/admin/admin_list_point_accounts.xml svneol=native#text/plain