cvs: phd(RESTRUCTURE) / README.REDESIGN compile.php render.php setup.php /include PhDSetupOptions.class.php

From: Date: Thu, 10 Jul 2008 16:51:28 +0000
Subject: cvs: phd(RESTRUCTURE) / README.REDESIGN compile.php render.php setup.php /include PhDSetupOptions.class.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-1857@lists.php.net to get a copy of this message
gwynne Thu Jul 10 16:51:28 2008 UTC Added files: (Branch: RESTRUCTURE) /phd README.REDESIGN setup.php /phd/include PhDSetupOptions.class.php Modified files: /phd compile.php render.php Log: fixed the way configs are included, added redesign notes, start phd-setup http://cvs.php.net/viewvc.cgi/phd/compile.php?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: phd/compile.php diff -u phd/compile.php:1.1.2.2 phd/compile.php:1.1.2.3 --- phd/compile.php:1.1.2.2 Thu Jul 10 12:35:59 2008 +++ phd/compile.php Thu Jul 10 16:51:28 2008 @@ -1,6 +1,6 @@ #!@php_bin@ <?php -/* $Id: compile.php,v 1.1.2.2 2008/07/10 12:35:59 gwynne Exp $ */ +/* $Id: compile.php,v 1.1.2.3 2008/07/10 16:51:28 gwynne Exp $ */ $base_revision = '$Rev$'; /* {{{ Find the $ROOT directory of PhD. @php_dir@ will be replaced by the PEAR @@ -12,9 +12,7 @@ } /* }}} */ -require_once ($ROOT . "/config.php"); - -(include $ROOT . "/include/PhDCompileOptions.class.php") - or die("Invalid configuration.\nThis should never happen, did you edit config.php yourself?\nRe-run phd-setup.\n"); +require_once $ROOT . "/config.php"; +require_once $ROOT . "/include/PhDCompileOptions.class.php"; ?> http://cvs.php.net/viewvc.cgi/phd/render.php?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: phd/render.php diff -u phd/render.php:1.1.2.2 phd/render.php:1.1.2.3 --- phd/render.php:1.1.2.2 Thu Jul 10 12:35:59 2008 +++ phd/render.php Thu Jul 10 16:51:28 2008 @@ -1,6 +1,6 @@ #!@php_bin@ <?php -/* $Id: render.php,v 1.1.2.2 2008/07/10 12:35:59 gwynne Exp $ */ +/* $Id: render.php,v 1.1.2.3 2008/07/10 16:51:28 gwynne Exp $ */ $base_revision = '$Rev$'; /* {{{ Find the $ROOT directory of PhD @@ -13,10 +13,10 @@ } /* }}} */ -require_once ($ROOT . "/config.php"); +require_once $ROOT . "/config.php"; +require_once $ROOT . "/include/PhDRenderOptions.class.php"; -(include $ROOT . "/include/PhDRenderOptions.class.php") - && is_array(PhDConfig::output_theme()) +is_array(PhDConfig::output_theme()) or trigger_error("Invalid configuration. This should never happen, was config.php edited manually? Please re-run phd-setup.", E_USER_ERROR); /* If no docbook file was passed, die */ http://cvs.php.net/viewvc.cgi/phd/README.REDESIGN?view=markup&rev=1.1 Index: phd/README.REDESIGN +++ phd/README.REDESIGN http://cvs.php.net/viewvc.cgi/phd/setup.php?view=markup&rev=1.1 Index: phd/setup.php +++ phd/setup.php http://cvs.php.net/viewvc.cgi/phd/include/PhDSetupOptions.class.php?view=markup&rev=1.1 Index: phd/include/PhDSetupOptions.class.php +++ phd/include/PhDSetupOptions.class.php

« previous php.doc.cvs (#1857) next »