Merge branch 'develop' of github.com:bskrtich/PHPWord into develop

ivanlanin · ivanlanin · commit 0489533c5f0e · 2014-06-07T17:36:59.000+07:00
diff --git a/src/PhpWord/Autoloader.php b/src/PhpWord/Autoloader.php
@@ -30,9 +30,9 @@ class Autoloader
      *
      * @return void
      */
-    public static function register()
+    public static function register($throw = true, $prepend = false)
     {
-        spl_autoload_register(array(new self, 'autoload'));
+        spl_autoload_register(array(new self, 'autoload'), $throw, $prepend);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ class Autoloader`
`30`	`30`	`*`
`31`	`31`	`* @return void`
`32`	`32`	`*/`
`33`		`- public static function register()`
	`33`	`+ public static function register($throw = true, $prepend = false)`
`34`	`34`	`{`
`35`		`- spl_autoload_register(array(new self, 'autoload'));`
	`35`	`+ spl_autoload_register(array(new self, 'autoload'), $throw, $prepend);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`