Fixes for broken installation routine

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index d13df1113fdf123f5d2ef201a998419a99783060..6f8ed87c6c21198b77ff7fc25c3afb7bcbcb2b19 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -92,7 +92,8 @@ inc/autopurge/purge-unconfirmed.php -text
 inc/cache/.htaccess -text
 inc/check-reset.php -text
 inc/config-functions.php -text
-inc/config.php -text
+inc/config-global.php -text
+inc/config-local.php.dist -text
 inc/databases.php -text
 inc/db/.htaccess -text
 inc/db/lib-mysql3.php -text
@@ -124,11 +125,14 @@ inc/extensions/ext-doubler.php -text
 inc/extensions/ext-events.php -text
 inc/extensions/ext-holiday.php -text
 inc/extensions/ext-html_mail.php -text
+inc/extensions/ext-imprint.php -text
 inc/extensions/ext-iso3166.php -text
+inc/extensions/ext-lead.php -text
 inc/extensions/ext-logs.php -text
 inc/extensions/ext-mailid.php -text
 inc/extensions/ext-maintenance.php -text
 inc/extensions/ext-mediadata.php -text
+inc/extensions/ext-menu.php -text
 inc/extensions/ext-mods.php -text
 inc/extensions/ext-mydata.php -text
 inc/extensions/ext-network.php -text
@@ -148,6 +152,7 @@ inc/extensions/ext-removeip.php -text
 inc/extensions/ext-repair.php -text
 inc/extensions/ext-rewrite.php -text
 inc/extensions/ext-safe.php -text
+inc/extensions/ext-seo.php -text
 inc/extensions/ext-sponsor.php -text
 inc/extensions/ext-sql_patches.php -text
 inc/extensions/ext-support.php -text
@@ -173,6 +178,7 @@ inc/hooks.php -text
 inc/img/.htaccess -text
 inc/install-inc.php -text
 inc/js/.htaccess -text
+inc/language-functions.php -text
 inc/language.php -text
 inc/language/.htaccess -text
 inc/language/_de.php -text
@@ -260,6 +266,7 @@ inc/libs/user_functions.php -text
 inc/libs/wernis_functions.php -text
 inc/libs/yoomedia_functions.php -text
 inc/load_cache.php -text
+inc/load_config.php -text
 inc/load_extensions.php -text
 inc/loader/.htaccess -text
 inc/loader/load_cache-admin.php -text
@@ -416,9 +423,12 @@ inc/modules/admin/what-overview.php -text
 inc/modules/admin/what-payments.php -text
 inc/modules/admin/what-refbanner.php -text
 inc/modules/admin/what-repair_amenu.php -text
+inc/modules/admin/what-repair_amnu.php -text
 inc/modules/admin/what-repair_cats.php -text
 inc/modules/admin/what-repair_gmenu.php -text
+inc/modules/admin/what-repair_gmnu.php -text
 inc/modules/admin/what-repair_mmenu.php -text
+inc/modules/admin/what-repair_mmnu.php -text
 inc/modules/admin/what-send_bonus.php -text
 inc/modules/admin/what-send_newsletter.php -text
 inc/modules/admin/what-stats_mods.php -text
@@ -623,6 +633,7 @@ inc/stylesheet.php -text
 inc/weekly/.htaccess -text
 inc/weekly/weekly_ -text
 inc/weekly/weekly_surfbar.php -text
+inc/wrapper-functions.php -text
 /index.php -text
 /install.php -text
 install/menu-de.sql -text
@@ -1119,7 +1130,6 @@ templates/de/html/admin/admin_mods_stats.tpl -text
 templates/de/html/admin/admin_mods_stats2.tpl -text
 templates/de/html/admin/admin_mods_stats2_row.tpl -text
 templates/de/html/admin/admin_mods_stats_row.tpl -text
-templates/de/html/admin/admin_new_ext.tpl -text
 templates/de/html/admin/admin_newsletter.tpl -text
 templates/de/html/admin/admin_newsletter_nohtml.tpl -text
 templates/de/html/admin/admin_newsletter_tsk.tpl -text
@@ -1238,10 +1248,13 @@ templates/de/html/ext/ext_doubler.tpl -text
 templates/de/html/ext/ext_events.tpl -text
 templates/de/html/ext/ext_holiday.tpl -text
 templates/de/html/ext/ext_html_mail.tpl -text
+templates/de/html/ext/ext_imprint.tpl -text
+templates/de/html/ext/ext_lead.tpl -text
 templates/de/html/ext/ext_logs.tpl -text
 templates/de/html/ext/ext_mailid.tpl -text
 templates/de/html/ext/ext_maintenance.tpl -text
 templates/de/html/ext/ext_mediadata.tpl -text
+templates/de/html/ext/ext_menu.tpl -text
 templates/de/html/ext/ext_mods.tpl -text
 templates/de/html/ext/ext_mydata.tpl -text
 templates/de/html/ext/ext_network.tpl -text
@@ -1261,6 +1274,7 @@ templates/de/html/ext/ext_removeip.tpl -text
 templates/de/html/ext/ext_repair.tpl -text
 templates/de/html/ext/ext_rewrite.tpl -text
 templates/de/html/ext/ext_safe.tpl -text
+templates/de/html/ext/ext_seo.tpl -text
 templates/de/html/ext/ext_sponsor.tpl -text
 templates/de/html/ext/ext_sql_patches.tpl -text
 templates/de/html/ext/ext_support.tpl -text
@@ -1527,9 +1541,10 @@ templates/de/html/surfbar/surfbar_start_banner.tpl -text
 templates/de/html/surfbar/surfbar_stopped.tpl -text
 templates/de/html/task/.htaccess -text
 templates/de/html/task/task_ext_deactivated.tpl -text
-templates/de/html/theme_one.tpl -text
-templates/de/html/theme_select_box.tpl -text
-templates/de/html/theme_select_form.tpl -text
+templates/de/html/theme/.htaccess -text
+templates/de/html/theme/theme_one.tpl -text
+templates/de/html/theme/theme_select_box.tpl -text
+templates/de/html/theme/theme_select_form.tpl -text
 templates/de/html/welcome.tpl -text
 templates/en/html/admin/admin_welcome.tpl -text
 templates/en/html/impressum.tpl -text