diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /blog/web | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 'blog/web')
| -rw-r--r-- | blog/web/.htaccess | 11 | ||||
| -rwxr-xr-x | blog/web/fcgi/php-basic | 3 | ||||
| -rw-r--r-- | blog/web/index.php | 6 |
3 files changed, 0 insertions, 20 deletions
diff --git a/blog/web/.htaccess b/blog/web/.htaccess deleted file mode 100644 index 8d2ba9aa2..000000000 --- a/blog/web/.htaccess +++ /dev/null @@ -1,11 +0,0 @@ - -# BEGIN WordPress -<IfModule mod_rewrite.c> -RewriteEngine On -RewriteBase / -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule . /index.php [L] -</IfModule> - -# END WordPress diff --git a/blog/web/fcgi/php-basic b/blog/web/fcgi/php-basic deleted file mode 100755 index f3034d9e2..000000000 --- a/blog/web/fcgi/php-basic +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -PHP_FCGI_CHILDREN=1 PHPRC=/etc/php5/fcgi exec /usr/bin/php5-cgi - diff --git a/blog/web/index.php b/blog/web/index.php deleted file mode 100644 index fbc0ef37f..000000000 --- a/blog/web/index.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php - -# Copy of the lines from WP main index.php, so it can be in subdirectory -define('WP_USE_THEMES', true); -require('./wp/wp-blog-header.php'); - |