Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update EpiRoute.php #1591

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Update EpiRoute.php #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62abc29
Update EpiRoute.php
EMarcais May 26, 2016
e86d20c
Update EpiRoute.php
EMarcais May 26, 2016
812421d
Update .travis.yml
jmathai May 26, 2016
eae8439
Update initialize.php
EMarcais May 27, 2016
7599114
modifié : src/libraries/external/epi/EpiRoute.php
EMarcais May 27, 2016
06783af
Merge branch 'master' of https://github.com/EMarcais/frontend
EMarcais May 27, 2016
72d3311
Merge pull request #1 from EMarcais/patch-1
EMarcais May 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ before_install:
- sudo apt-get install build-essential libpcre3-dev php-pear php5-curl php5-imagick

before_script:
- pecl install oauth
- pear channel-discover pear.bovigo.org
- pear install bovigo/vfsStream-beta
- phpenv rehash
Expand Down
1 change: 0 additions & 1 deletion src/libraries/external/epi/EpiRoute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ public function load($file)
if(!file_exists($file))
{
EpiException::raise(new EpiException("Config file ({$file}) does not exist"));
break; // need to simulate same behavior if exceptions are turned off
}

$parsed_array = parse_ini_file($file, true);
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/initialize.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
require "{$basePath}/libraries/compatability.php";
require "{$basePath}/libraries/models/UserConfig.php";

Epi::setSetting('exceptions', true);
Epi::setSetting('exceptions', true);//let it to true for an install with PHP7 cf: Deleted break on line 90 to make it work with php7 in EpiRoute.php

Epi::setPath('base', $epiPath);
Epi::setPath('config', "{$basePath}/configs");
Epi::setPath('view', '');
Expand Down