Fix installer path detection by wagwag

diff --git a/docs/NEWS b/docs/NEWS
index 8828749d9a525b2e2d1a97d4e954a250832dad02..ef73a73e297fd36cedbffd45ddbad752421e58ae 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.2 ()
 ------------------------------------------------------------------------
 
+    * Improved Spartacus' detection of firewalling/network connection
+      issues (judebert)
+
     * Introduce '%lowertitle%' permalink attribute to use lowercase
       permalinks. (garvinhicking)
     
@@ -12,6 +15,9 @@ Version 1.2 ()
 Version 1.1 ()
 ------------------------------------------------------------------------
 
+    * Fix better installer warning messages when directories have no
+      write privileges and already exist. Thanks to wagwag!
+
     * Small bugfixes: Allow to use different login credentials than the
       current HTTP Basic-Auth, if used. Order categories by name in
       single entry view (garvinhicking)

diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index 3da52dfd907d3016fc9c3569712c5f319d648060..fa0e7fd0fa15ae8549053cab8dc6d730f4953d4e 100644 (file)
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -360,7 +360,7 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
             if ( is_writable($basedir . PATH_SMARTY_COMPILE) ) {
                 echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, WRITABLE);
             } else {
-                if ($basewritable) {
+                if ($basewritable && !is_dir($basedir . PATH_SMARTY_COMPILE)) {
                     echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, WRITABLE);
                     #This directory will be created later in the process
                 } else {
@@ -376,7 +376,7 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
             if ( is_writable($basedir . 'archives/') ) {
                 echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, WRITABLE);
             } else {
-                if ($basewritable) {
+                if ($basewritable && !is_dir($basedir . 'archives/')) {
                     echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, WRITABLE);
                     #This directory will be created later in the process
                 } else {
@@ -393,7 +393,7 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
             if ( is_writable($basedir . 'uploads/') ) {
                 echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, WRITABLE);
             } else {
-                if ($basewritable) {
+                if ($basewritable && !is_dir($basedir . 'uploads/')) {
                     echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, WRITABLE);
                     #This directory will be created later in the process
                 } else {