From: <ru...@us...> - 2010-06-07 12:08:13
|
Revision: 7476 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7476&view=rev Author: rurban Date: 2010-06-07 12:08:07 +0000 (Mon, 07 Jun 2010) Log Message: ----------- simplify if GFORGE Modified Paths: -------------- trunk/lib/IniConfig.php trunk/lib/PagePerm.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-06-07 11:42:44 UTC (rev 7475) +++ trunk/lib/IniConfig.php 2010-06-07 12:08:07 UTC (rev 7476) @@ -194,6 +194,7 @@ 'DISABLE_HTTP_REDIRECT', 'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP', 'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT', + 'GFORGE', 'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA', 'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML', 'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE', @@ -203,7 +204,7 @@ 'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY', 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC', 'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES', - 'READONLY', 'GFORGE' + 'READONLY' ); $rs = @parse_ini_file($file); Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2010-06-07 11:42:44 UTC (rev 7475) +++ trunk/lib/PagePerm.php 2010-06-07 12:08:07 UTC (rev 7476) @@ -236,7 +236,7 @@ $page = $request->getPage($pagename); // Exceptions: - if (defined('GFORGE') and GFORGE) { + if (GFORGE) { if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && ! $page->get('external')) { $permcache[$pagename][$access] = 0; return 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |