Permalink
Browse files

Fixing merge

  • Loading branch information...
2 parents 4bf90e1 + 76be19c commit b8a8dc255e80292ae6ad80adaddc19b660b05bcf randy committed Aug 15, 2011
Showing with 6 additions and 4 deletions.
  1. +2 −2 .gitignore
  2. +4 −2 config.php
View
@@ -1,3 +1,3 @@
/config.xml
-tmp
-.DS_Store
+tmp/
+.DS_Store
View
@@ -71,8 +71,10 @@ public static function Instance()
if (static::$file == null)
static::$file = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'config.xml';
- if (!file_exists(static::$file))
- trigger_error("No configuration found for Instaphp", E_USER_ERROR);
+ if (!file_exists(static::$file)) {
+ trigger_error("No configuration found for Instaphp. Using sample file!", E_USER_WARNING);
+ static::$file = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'config.sample.xml';
+ }
if (null == static::$_instance)
static::$_instance = new self(static::$file, null, true);

0 comments on commit b8a8dc2

Please sign in to comment.