rediff init.php patching

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 956a7eaedb811c2298d8372b67fcb88c32612f82..ffbfa1431214916b7082994e189efc6535ae157b 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,6 +1,6 @@
---- eventum-3.0.0/init.php~    2015-02-02 20:02:01.825332859 +0200
-+++ eventum-3.0.0/init.php     2015-02-02 20:03:12.610911011 +0200
-@@ -27,7 +27,7 @@
+--- eventum-3.0.2-28-g0d12f69.old/init.php     2015-09-14 13:20:59.450996838 +0300
++++ eventum-3.0.2-28-g0d12f69/init.php 2015-09-11 23:17:34.000000000 +0300
+@@ -28,7 +28,7 @@
  // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
  // +----------------------------------------------------------------------+
  
@@ -9,7 +9,7 @@
      Header('Location: setup/');
      exit(0);
  }
-@@ -47,7 +47,7 @@
+@@ -45,7 +45,7 @@
  // define base path
  define('APP_PATH', realpath(dirname(__FILE__)));
  if (!defined('APP_CONFIG_PATH')) {
@@ -18,8 +18,6 @@
  }
  
  // include local site config. may override any default
---- eventum-3.0.0/init.php~    2015-02-02 20:02:01.825332859 +0200
-+++ eventum-3.0.0/init.php     2015-02-02 20:03:12.610911011 +0200
 @@ -78,7 +78,7 @@
  }
  
@@ -29,7 +27,7 @@
  }
  
  if (!defined('APP_INC_PATH')) {
-@@ -81,7 +77,7 @@
+@@ -86,11 +86,11 @@
  }
  
  if (!defined('APP_LOCKS_PATH')) {
@@ -37,16 +35,21 @@
 +    define('APP_LOCKS_PATH', '/var/run/eventum/');
  }
  
- if (!defined('APP_SQL_PATCHES_PATH')) {
-@@ -89,7 +85,7 @@
- }
- 
  if (!defined('APP_LOG_PATH')) {
 -    define('APP_LOG_PATH', APP_PATH . '/logs');
 +    define('APP_LOG_PATH', '/var/log/eventum');
  }
  
- if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
+ if (!defined('APP_ERROR_LOG')) {
+@@ -197,6 +197,8 @@
+ }
+ 
+ require_once APP_PATH . '/autoload.php';
++# hack
++require_once '/usr/share/php/Smarty3/plugins/block.t.php';
+ 
+ // fix magic_quote_gpc'ed values
+ if (get_magic_quotes_gpc()) {
 --- eventum-3.0.0/htdocs/setup/index.php~      2015-02-02 20:03:49.507010317 +0200
 +++ eventum-3.0.0/htdocs/setup/index.php       2015-02-02 20:05:00.139257552 +0200
 @@ -44,10 +44,10 @@
@@ -154,14 +157,3 @@
  }
  
  // add PEAR to the include path, required by PEAR classes
---- ./init.php 2015-08-04 21:55:51.000000000 +0300
-+++ ./init.php 2015-07-02 22:16:40.638270324 +0300
-@@ -197,6 +197,8 @@
- }
- 
- require_once APP_PATH . '/autoload.php';
-+# hack
-+require_once '/usr/share/php/Smarty3/plugins/block.t.php';
- 
- // fix magic_quote_gpc'ed values
- if (get_magic_quotes_gpc()) {