Ticket #28766: hhvm_permalink_fix.diff

wp-admin/includes/misc.php

@@ -41 +41 @@
  * @return bool Whether the server supports URL rewriting.
  */
 function got_url_rewrite() {
-        $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+        $got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || $GLOBALS['is_hhvm'] || iis7_supports_permalinks() );
 
         /**
          * Filter whether URL rewriting is available.

wp-admin/options-permalink.php

@@ -127 +127 @@
                 $writable = true;
         else
                 $writable = false;
-} elseif ( $is_nginx ) {
+} elseif ( $is_nginx || $is_hhvm) {
         $writable = false;
 } else {
         if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
@@ -159 +159 @@
                         _e('Permalink structure updated. Remove write access on web.config file now!');
                 else
                         _e('Permalink structure updated.');
-        } elseif ( $is_nginx ) {
+        } elseif ( $is_nginx || $is_hhvm) {
                 _e('Permalink structure updated.');
         } else {
                 if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) {
@@ -278 +278 @@
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
                 <?php endif; ?>
         <?php endif; ?>
-<?php elseif ( ! $is_nginx ) :
+<?php elseif ( ! $is_nginx  && ! $is_hhvm) :
         if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">

wp-includes/vars.php

@@ -17 +17 @@
 
 global $pagenow,
         $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE,
-        $is_apache, $is_IIS, $is_iis7, $is_nginx;
+        $is_apache, $is_IIS, $is_iis7, $is_nginx, $is_hhvm;
 
 // On which page are we ?
 if ( is_admin() ) {
@@ -104 +104 @@
 $is_nginx = (strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
 
 /**
+ * Whether the server software is HHVM or something else
+ * @global bool $is_hhvm
+ */
+$is_hhvm = (strpos($_SERVER['SERVER_SOFTWARE'], 'HPHP') !== false);
+
+/**
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */