<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[GlotPress][715] trunk/gp-settings.php: Don't use glob() for files we know about in gp-settings.php.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/715">715</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-31 00:08:38 +0000 (Wed, 31 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use glob() for files we know about in gp-settings.php.
glob() will return files in any order it pleases, which can cause
problems when a parent class must be loaded before its children.
fixes <a href="http://glotpress.trac.wordpress.org/ticket/211">#211</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpsettingsphp">trunk/gp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-settings.php (714 => 715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-settings.php 2012-10-31 00:02:27 UTC (rev 714)
+++ trunk/gp-settings.php 2012-10-31 00:08:38 UTC (rev 715)
</span><span class="lines">@@ -280,48 +280,53 @@
</span><span class="cx"> require_once( GP_PATH . GP_INC . 'advanced-permissions.php' );
</span><span class="cx">
</span><span class="cx"> require_once GP_PATH . GP_INC . 'thing.php';
</span><del>-foreach( glob( GP_PATH . GP_INC . 'things/*.php' ) as $thing_file ) {
- require_once $thing_file;
-}
</del><ins>+require_once GP_PATH . GP_INC . 'things/original.php';
+require_once GP_PATH . GP_INC . 'things/permission.php';
+require_once GP_PATH . GP_INC . 'things/project.php';
+require_once GP_PATH . GP_INC . 'things/translation-set.php';
+require_once GP_PATH . GP_INC . 'things/translation.php';
+require_once GP_PATH . GP_INC . 'things/user.php';
+require_once GP_PATH . GP_INC . 'things/validator-permission.php';
</ins><span class="cx">
</span><span class="cx"> require_once( GP_PATH . GP_INC . 'route.php' );
</span><span class="cx"> require_once( GP_PATH . GP_INC . 'router.php' );
</span><del>-foreach( glob( GP_PATH . GP_INC . 'routes/*.php' ) as $route_file ) {
- require_once $route_file;
-}
</del><span class="cx">
</span><ins>+require_once GP_PATH . GP_INC . 'routes/_main.php';
+require_once GP_PATH . GP_INC . 'routes/index.php';
+require_once GP_PATH . GP_INC . 'routes/login.php';
+require_once GP_PATH . GP_INC . 'routes/original.php';
+require_once GP_PATH . GP_INC . 'routes/project.php';
+require_once GP_PATH . GP_INC . 'routes/translation-set.php';
+require_once GP_PATH . GP_INC . 'routes/translation.php';
+
</ins><span class="cx"> GP::$translation_warnings = new GP_Translation_Warnings();
</span><span class="cx"> GP::$builtin_translation_warnings = new GP_Builtin_Translation_Warnings();
</span><span class="cx"> GP::$builtin_translation_warnings->add_all( GP::$translation_warnings );
</span><span class="cx"> GP::$router = new GP_Router();
</span><span class="cx"> GP::$formats = array();
</span><span class="cx">
</span><del>-foreach( glob( GP_PATH . GP_INC . 'formats/format_*.php' ) as $format_file ) {
- require_once $format_file;
-}
-unset( $format_file );
</del><ins>+require_once GP_PATH . GP_INC . 'formats/format_android.php';
+require_once GP_PATH . GP_INC . 'formats/format_pomo.php';
+require_once GP_PATH . GP_INC . 'formats/format_resx.php';
+require_once GP_PATH . GP_INC . 'formats/format_rrc.php';
+require_once GP_PATH . GP_INC . 'formats/format_strings.php';
</ins><span class="cx">
</span><span class="cx"> // Let's do it again, there are more variables added since last time we called it
</span><span class="cx"> gp_set_globals( get_defined_vars() );
</span><span class="cx">
</span><span class="cx"> require_once( GP_PATH . GP_INC . 'plugin.php' );
</span><span class="cx">
</span><del>-$plugins = glob( GP_PLUGINS_PATH . '*.php' );
-if ( $plugins ) {
- foreach( $plugins as $plugin ) {
- require_once $plugin;
</del><ins>+$plugins = scandir( GP_PLUGINS_PATH );
+foreach ( $plugins as $plugin ) {
+ if ( is_dir( GP_PLUGINS_PATH . '/' . $plugin ) ) {
+ if ( is_readable( GP_PLUGINS_PATH . "/$plugin/$plugin.php" ) )
+ require_once GP_PLUGINS_PATH . "/$plugin/$plugin.php";
+ } else {
+ require_once GP_PLUGINS_PATH . $plugin;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+unset( $plugins, $plugin );
</ins><span class="cx">
</span><del>-$plugin_dirs = glob( GP_PLUGINS_PATH . '*', GLOB_ONLYDIR );
-if ( $plugin_dirs ) {
- foreach( $plugin_dirs as $plugin_dir ) {
- $plugin = "$plugin_dir/" . basename( $plugin_dir ) . '.php';
- if ( is_readable( $plugin ) ) require_once $plugin;
- }
-}
-unset( $plugins, $plugin, $plugin_dirs, $plugin_dir );
-
</del><span class="cx"> do_action( 'plugins_loaded' );
</span><span class="cx">
</span><span class="cx"> if ( defined( 'GP_INSTALLING' ) && GP_INSTALLING )
</span></span></pre>
</div>
</div>
</body>
</html>