com web/bugs: s/SVN/Git/g: include/php_versions.php templ ates/patchform.php www/bug.php www/fix.php www/how- to-report.php www/index.php

Commit: 813b3cf4ab5f5620e47d4ab632c9fa9addd8e27a Author: Rasmus Lerdorf <rasmus@php.net> Sun, 25 Mar 2012 22:26:54 +0530 Parents: cad77dbb3906e5774bc3c32a38f55ed5ac351bc3 Branches: master Link: http://git.php.net/?p=web/bugs.git;a=commitdiff;h=813b3cf4ab5f5620e47d4ab632c9fa9addd8e27a Log: s/SVN/Git/g Changed paths: M include/php_versions.php M templates/patchform.php M www/bug.php M www/fix.php M www/how-to-report.php M www/index.php Diff: 813b3cf4ab5f5620e47d4ab632c9fa9addd8e27a diff --git a/include/php_versions.php b/include/php_versions.php index d57fac5..27369f7 100644 --- a/include/php_versions.php +++ b/include/php_versions.php @@ -5,8 +5,8 @@ if you want to add a new version, add it there at include/release-qa.php the result is cached for an hour, you can force it to refresh, if you delete the 'bugs.versions' item from apc the versions are weighted by the following: - - major+minor version desc (6>5.4>5.3>trunk) - - between a minor version we order by the micro if available: first the qa releases: alpha/beta/rc, then the stable, then the svn versions(snaps, svn) + - major+minor version desc (6>5.4>5.3>master) + - between a minor version we order by the micro if available: first the qa releases: alpha/beta/rc, then the stable, then the Git versions(snaps, Git) */ if (!$versions = apc_fetch('bugs.versions')) { @@ -25,8 +25,8 @@ $date = date('Y-m-d'); $default_versions = array( - "SVN-{$date} (snap)", - "SVN-{$date} (SVN)", + "Git-{$date} (snap)", + "Git-{$date} (Git)", ); foreach ($dev_versions as $dev_version) { @@ -62,9 +62,9 @@ $flat_versions = array(); - // add trunk to the end of the list + // add master to the end of the list foreach ($default_versions as $default_version) { - $flat_versions[] = 'trunk-'.$default_version; + $flat_versions[] = 'master-'.$default_version; } // add the fetched versions to the list diff --git a/templates/patchform.php b/templates/patchform.php index 021f156..24e9003 100644 --- a/templates/patchform.php +++ b/templates/patchform.php @@ -13,7 +13,7 @@ <th class="form-label_left"> Patch file: <p class="cell_note"> - A patch file created using <kbd>svn diff</kbd> (unified diff format) + A patch file created using <kbd>git diff</kbd> (unified diff format) </p> </th> <td class="form-input"> diff --git a/www/bug.php b/www/bug.php index d3c8b03..ba2ecab 100644 --- a/www/bug.php +++ b/www/bug.php @@ -790,13 +790,13 @@ if ($edit == 1 || $edit == 2) { ?> </div> <?php } else { ?> <div class="explain"> - Welcome! If you don't have a SVN account, you can't do anything here.<br /> + Welcome! If you don't have a Git account, you can't do anything here.<br /> You can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=3">add a comment by following this link</a> or if you reported this bug, you can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=2">edit this bug over here</a>. <div class="details"> - <label for="svnuser">SVN Username:</label> + <label for="svnuser">Git Username:</label> <input type="text" id="svnuser" name="user" value="<?php echo htmlspecialchars($user); ?>" size="10" maxlength="20" /> - <label for="svnpw">SVN Password:</label> + <label for="svnpw">Git Password:</label> <input type="password" id="svnpw" name="pw" value="<?php echo htmlspecialchars($pw); ?>" size="10" maxlength="20" /> <!--<label for="save">Remember:</label><input style="vertical-align:middle;" type="checkbox" id="save" name="save" <?php echo !empty($_POST['save']) ? 'checked="checked"' : ''; ?> />--> <?php if (!$show_bug_info) { ?> @@ -1054,7 +1054,7 @@ if ($show_bug_info && is_array($bug_comments) && count($bug_comments) && $bug['s 'type_all' => 'All', 'type_comment' => 'Comments', 'type_log' => 'Changes', - 'type_svn' => 'SVN commits' + 'type_svn' => 'Git/SVN commits' ); if (!isset($_COOKIE['history_tab']) || !isset($history_tabs[$_COOKIE['history_tab']])) { diff --git a/www/fix.php b/www/fix.php index 5a6dbf6..71b1fc2 100644 --- a/www/fix.php +++ b/www/fix.php @@ -67,13 +67,13 @@ if ($logged_in == 'developer') { </div> <?php } else { ?> <div class="explain"> - Welcome! If you don't have a SVN account, you can't do anything here.<br /> + Welcome! If you don't have a Git account, you can't do anything here.<br /> You can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=3">add a comment by following this link</a> or if you reported this bug, you can <a href="bug.php?id=<?php echo $bug_id; ?>&amp;edit=2">edit this bug over here</a>. <div class="details"> - <label for="svnuser">SVN Username:</label> + <label for="svnuser">Git Username:</label> <input type="text" id="svnuser" name="user" value="<?php echo htmlspecialchars($user) ?>" size="10" maxlength="20" /> - <label for="svnpw">SVN Password:</label> + <label for="svnpw">Git Password:</label> <input type="password" id="svnpw" name="pw" value="<?php echo htmlspecialchars($pwd) ?>" size="10" maxlength="20" /> <label for="save">Remember:</label><input style="vertical-align:middle;" type="checkbox" id="save" name="save" <?php echo !empty($_POST['save']) ? 'checked="checked"' : ''; ?> /> </div> diff --git a/www/how-to-report.php b/www/how-to-report.php index af8e401..3aed7bf 100644 --- a/www/how-to-report.php +++ b/www/how-to-report.php @@ -53,8 +53,8 @@ reports.</p> <p>We will most likely ask you to try a snapshot to verify whether the problem has been fixed in our repository or not. You can save yourself and us some time if you first try to reproduce the bug with the latest stable snapshot. If -the bug still exists, select 5SVN.. as your version. Note that the format is -5SVN-YYYY-MM-DD. Here are the latest snapshots for version 5 of PHP: +the bug still exists, select 5Git.. as your version. Note that the format is +5Git-YYYY-MM-DD. Here are the latest snapshots for version 5 of PHP: <ul> <li><a href="http://windows.php.net/snapshots/">Windows</a></li> <li><a href="http://snaps.php.net/php5.2-latest.tar.gz">Source code</a></li> diff --git a/www/index.php b/www/index.php index 0833cb4..87a48fd 100644 --- a/www/index.php +++ b/www/index.php @@ -46,7 +46,7 @@ if (bugid > 0) { </li> <li> - Made sure you are using the latest stable version or a build from SVN, if + Made sure you are using the latest stable version or a build from Git, if similar bugs have recently been fixed and committed. You can download snapshots at <a href="http://snaps.php.net/">http://snaps.php.net</a> </li>