Merge remote branch 'upstream/develop' into develop-next

include/class.i18n.php

@@ -306,7 +306,8 @@ class DataTemplate {
                 $this->filepath = Misc::realpath("{$this->base}/$l/$path");
                 break;
             }
-            elseif (Phar::isValidPharFilename("{$this->base}/$l.phar")
+            elseif (class_exists('Phar')
+                    && Phar::isValidPharFilename("{$this->base}/$l.phar")
                     && file_exists("phar://{$this->base}/$l.phar/$path")) {
                 $this->lang = $l;
                 $this->filepath = "phar://{$this->base}/$l.phar/$path";

include/class.plugin.php

@@ -192,6 +192,7 @@ class PluginManager {
                 GLOB_NOSORT|GLOB_BRACE) as $p) {
             $is_phar = false;
             if (substr($p, strlen($p) - 5) == '.phar'
+                    && class_exists('Phar')
                     && Phar::isValidPharFilename($p)) {
                 try {
                 // When public key is invalid, openssl throws a

include/staff/system.inc.php

@@ -51,6 +51,21 @@ $commit = GIT_VERSION != '$git' ? GIT_VERSION : (
                     echo extension_loaded('mbstring')?'check':'warning-sign'; ?>"></i></td>
                 <td>mbstring</td>
                 <td>Highly recommended for non western european language content</td></tr>
+            <tr><td><i class="icon icon-<?php
+                    echo extension_loaded('phar')?'check':'warning-sign'; ?>"></i></td>
+                <td>phar</td>
+                <td>Highly recommended for plugins and language packs</td></tr>
+        </tbody></table></td></tr>
+    <tr><td>PHP Settings</td>
+        <td><table><tbody>
+        <tr><td><i class="icon icon-<?php
+                echo extension_loaded('mbstring')?'check':'warning-sign'; ?>"></i>
+            </td><td>
+            <code>cgi.fix_pathinfo</code> =
+                <?php echo ini_get('cgi.fix_pathinfo'); ?>
+            </td><td>
+            <span class="faded">"1" is recommended if AJAX is not working</span>
+        </td></tr>
         </tbody></table></td></tr>
 </tbody>
 <thead>

setup/inc/install-prereq.inc.php

@@ -29,6 +29,7 @@ if(!defined('SETUPINC')) die('Kwaheri!');
                 <li class="<?php echo extension_loaded('json')?'yes':'no'; ?>">PHP JSON extension (faster performance)</li>
                 <li class="<?php echo extension_loaded('gettext')?'yes':'no'; ?>">Gettext is used for translations (faster performance)</li>
                 <li class="<?php echo extension_loaded('mbstring')?'yes':'no'; ?>">Mbstring is <b>strongly</b> recommended for all installations</li>
+                <li class="<?php echo extension_loaded('phar')?'yes':'no'; ?>">Phar is <b>strongly</b> recommended for plugins and language packs</li>
             </ul>
             <div id="bar">
                 <form method="post" action="install.php">

setup/test/tests/stubs.php

@@ -96,9 +96,9 @@ class Phar {
 
 class ZipArchive {
     function statIndex() {}
+    function addFromString() {}
     function getFromIndex() {}
     function setCommentName() {}
-    function addFromString() {}
 }
 
 class finfo {