Merge pull request #639 from openeyes/release/v1.17.1

Release/v1.17.1
AppertaFoundation · Feb 10, 2017 · f664e0a · f664e0a
2 parents 96975e0 + f58d4aa
commit f664e0a
Show file tree

Hide file tree

Showing 136 changed files with 6,385 additions and 2,775 deletions.
diff --git a/ansible/tasks/init-debian.yml b/ansible/tasks/init-debian.yml
@@ -16,14 +16,6 @@
   apt_repository: repo='ppa:ondrej/apache2'
   when: ansible_distribution_release == "precise" and ansible_distribution == "Ubuntu"
 
-- name: Add repository for PHP 5.6.
-  apt_repository: repo='ppa:ondrej/php5-5.6'
-  when: php_version == "5.6" and ansible_distribution == "Ubuntu"
-
-- name: Add repository for PHP 7.0.
-  apt_repository: repo='ppa:ondrej/php'
-  when: php_version == "7.0" and ansible_distribution == "Ubuntu"
-
 - name: Define php_xhprof_html_dir.
   set_fact:
     php_xhprof_html_dir: "/usr/share/php/xhprof_html"

diff --git a/index.php b/index.php
@@ -17,8 +17,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html The GNU General Public License V3.0
  */
 $dirname = dirname(__FILE__);
-if (file_exists($dirname . '/vendor/autoload.php'))
+if (file_exists($dirname . '/vendor/autoload.php')){
     require_once($dirname . '/vendor/autoload.php');
+}
 
 if (file_exists($dirname . '/vendor/yiisoft/yii/framework/yii.php')) {
     $yii = $dirname . '/vendor/yiisoft/yii/framework/yii.php';