diff options
| author | Greg Roach <fisharebest@gmail.com> | 2014-10-06 21:24:32 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2014-10-06 21:24:32 +0100 |
| commit | a4a6645c3a3a6a811d5571aae0f21a17576b27d5 (patch) | |
| tree | 335f7c967b68ce4a5001f7423daabbcd25436ecf /includes | |
| parent | 1480a0f478b98c16090a5e560553b52518e3e7d6 (diff) | |
| download | webtrees-a4a6645c3a3a6a811d5571aae0f21a17576b27d5.tar.gz webtrees-a4a6645c3a3a6a811d5571aae0f21a17576b27d5.tar.bz2 webtrees-a4a6645c3a3a6a811d5571aae0f21a17576b27d5.zip | |
Whitespace changes to reduce merge conflicts with the assets branch
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/db_schema/db_schema_27_28.php | 2 | ||||
| -rw-r--r-- | includes/session.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/db_schema/db_schema_27_28.php b/includes/db_schema/db_schema_27_28.php index d8f2648b36..02e64f2245 100644 --- a/includes/db_schema/db_schema_27_28.php +++ b/includes/db_schema/db_schema_27_28.php @@ -54,7 +54,7 @@ try { " ADD INDEX `##site_access_rule_ix2` (rule)" ); } catch (Exception $ex) { - // Already done? + // Already done?git } // Update the version to indicate success diff --git a/includes/session.php b/includes/session.php index 68b5f05c92..9e5c800dc7 100644 --- a/includes/session.php +++ b/includes/session.php @@ -663,7 +663,7 @@ if ($SEARCH_SPIDER && !in_array(WT_SCRIPT_NAME , array( 'individual.php', 'family.php', 'mediaviewer.php', 'note.php', 'repo.php', 'source.php', ))) { header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden'); - $controller=new WT_Controller_Page(); + $controller = new WT_Controller_Page(); $controller->setPageTitle(WT_I18N::translate('Search engine')); $controller->pageHeader(); echo '<p class="ui-state-error">', WT_I18N::translate('You do not have permission to view this page.'), '</p>'; |