svn: /phd/trunk/ package_php.xml phpdotnet/phd/Package/PHP/CHM.php

rquadling Mon, 06 Jun 2011 12:19:17 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311863 Log: Added support for local CSS files rather than forcing them to be from http://www.php.net/styles Changed paths: U phd/trunk/package_php.xml U phd/trunk/phpdotnet/phd/Package/PHP/CHM.php Modified: phd/trunk/package_php.xml =================================================================== --- phd/trunk/package_php.xml 2011-06-06 10:45:33 UTC (rev 311862) +++ phd/trunk/package_php.xml 2011-06-06 12:19:17 UTC (rev 311863) @@ -42,6 +42,7 @@ <notes> - Fixed Bug #54436 - gzip issues with -P PHP -f manpage (Moacir) - Fixed bug #53536 - Small display bug in attribute description for mysqli-&gt;insert_id + - Added support for local CSS files (Richard Quadling) </notes> <contents> Modified: phd/trunk/phpdotnet/phd/Package/PHP/CHM.php =================================================================== --- phd/trunk/phpdotnet/phd/Package/PHP/CHM.php 2011-06-06 10:45:33 UTC (rev 311862) +++ phd/trunk/phpdotnet/phd/Package/PHP/CHM.php 2011-06-06 12:19:17 UTC (rev 311863) @@ -429,7 +429,8 @@ } protected function fetchStylesheet($name = null) { - $stylesheet = file_get_contents($name = "http://www.php.net/styles/" . (is_null($name) ? "site.css" : $name)); + /* Use a local CSS file if it can be found. If not, try and load it from http://www.php.net/styles. If no name is supplied then use the PHP default. */ + $stylesheet = file_get_contents($name = realpath($name) ? realpath($name) : "http://www.php.net/styles/" . (is_null($name) ? "site.css" : $name)); if ($stylesheet) { v('Loaded %s stylesheet.', $name, VERBOSE_MESSAGES); return $stylesheet;