Fix for non-working theme-selector

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index c31c7eb78bf1167c12487e2b1074d17693d2c880..d93731ab0dbc14ee3cc4eac0a4cfa70eb95bdd4e 100644 (file)
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -57,7 +57,13 @@ function setIncludePool ($pool, $includePool) {
 // Getter for INC_POOL
 function getIncludePool ($pool) {
        //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'<br />';
-       return $GLOBALS['inc_pool'][$pool];
+       if (isset($GLOBALS['inc_pool'][$pool])) {
+               // Return found pool (array)
+               return $GLOBALS['inc_pool'][$pool];
+       } else {
+               // Return empty array if not found
+               return array();
+       }
 }
 
 // Count INC_POOL

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 9d97d505c302a67c1daaf87fe5d906d79f121f1f..a1b563054a0e02599f65d9848e68bdfe9ea7aa26 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Create a selection box with installed and activated themes or all if admin
 function generateThemeSelectionBox () {
@@ -49,9 +49,9 @@ function generateThemeSelectionBox () {
        $mod = getModule();
 
        // Construction URL
-       $formAction = "{%url=modules.php?module=" . $mod;
-       if (!empty($what)) $formAction .= "&what=" . $what;
-       $formAction = '%}';
+       $formAction = '{%url=modules.php?module='. $mod;
+       if (!empty($what)) $formAction .= '&what=' . $what;
+       $formAction .= '%}';
 
        // Initialize array
        $themesArray = array(

diff --git a/templates/de/html/admin/admin_theme_edit.tpl b/templates/de/html/admin/admin_theme_edit.tpl
index 2b2b02396ba80ffe7ed0f1e2b48205b825660aa5..1197c9fd2140112ba8a0a1a6c2b44fc3794759f6 100644 (file)
--- a/templates/de/html/admin/admin_theme_edit.tpl
+++ b/templates/de/html/admin/admin_theme_edit.tpl
@@ -7,17 +7,15 @@
                <td class="header_column bottom right" align="center">{--THEME_NAME--}</td>
                <td class="header_column bottom right" align="center">{--THEME_ACTIVE--}</td>
                <td class="header_column bottom right" align="center">{--THEME_AUTHOR--}</td>
-               <td class="header_column bottom right" align="center">{--THEME_URL--}</td>
                <td class="header_column bottom" align="center">{--THEME_VERSION--}</td>
        </tr>
        $content
        <tr>
-               <td colspan="7" class="admin_footer"><input
-                       type="reset" class="admin_reset" value="{--RESET_SELECT--}" />
-               <input type="submit" name="status" class="admin_submit"
-                       value="{--ADMIN_CHANGE_STATUS_THEME--}" /> <input
-                       type="submit" name="del" class="admin_delete"
-                       value="{--ADMIN_DELETE_ENTRIES--}" /></td>
+               <td colspan="6" class="admin_footer">
+                       <input type="reset" class="admin_reset" value="{--RESET_SELECT--}" />
+                       <input type="submit" name="status" class="admin_submit" value="{--ADMIN_CHANGE_STATUS_THEME--}" />
+                       <input type="submit" name="del" class="admin_delete" value="{--ADMIN_DELETE_ENTRIES--}" />
+               </td>
        </tr>
 </table>
 </form>

diff --git a/templates/de/html/admin/admin_theme_edit_row.tpl b/templates/de/html/admin/admin_theme_edit_row.tpl
index 1314d265b6a7ac499f92fae879efe441dd4ee380..22dce6d40fde036bb9ae014e7c7edfaf725e04f3 100644 (file)
--- a/templates/de/html/admin/admin_theme_edit_row.tpl
+++ b/templates/de/html/admin/admin_theme_edit_row.tpl
@@ -18,7 +18,7 @@
        <td class="switch_sw$content[sw] bottom right" align="center">
                <a href="$content[url_link]" target="_blank">$content[url_title]</a>
        </td>
-       <td class="switch_sw$content[sw] bottom right" align="center">
+       <td class="switch_sw$content[sw] bottom" align="center">
                v$content[ver]
        </td>
 </tr>

diff --git a/templates/de/html/admin/admin_theme_import_row.tpl b/templates/de/html/admin/admin_theme_import_row.tpl
index 5d900187775d6b879ea6b9f747091e56242153a7..4c5891a2f7af3c810ab9c39b0526a5870b90fec3 100644 (file)
--- a/templates/de/html/admin/admin_theme_import_row.tpl
+++ b/templates/de/html/admin/admin_theme_import_row.tpl
@@ -1,14 +1,14 @@
 <tr>
-  <td class="switch_sw$content[sw] bottom right" align="center">$content[unix]</td>
-  <td class="switch_sw$content[sw] bottom right" align="center">$content[name]</td>
-  <td class="switch_sw$content[sw] bottom right" align="center">
-    <a href="mailto:$content[email]?Subject=[Theme:] $content[name] ($content[unix])"."">$content[author]</a>
-  </td>
-  <td class="switch_sw$content[sw] bottom right" align="center">
-    <a href="$content[link]" target="_blank">$content[url]</a>
-  </td>
-  <td class="switch_sw$content[sw] bottom right" align="center">v$content[version]</td>
-  <td class="switch_sw$content[sw] bottom" align="center">
-    $content[form]
-  </td>
+       <td class="switch_sw$content[sw] bottom right" align="center">$content[unix]</td>
+       <td class="switch_sw$content[sw] bottom right" align="center">$content[name]</td>
+       <td class="switch_sw$content[sw] bottom right" align="center">
+               <a href="mailto:$content[email]?Subject=[Theme:] $content[name] ($content[unix])">$content[author]</a>
+       </td>
+       <td class="switch_sw$content[sw] bottom right" align="center">
+               <a href="$content[link]" target="_blank">$content[url]</a>
+       </td>
+       <td class="switch_sw$content[sw] bottom right" align="center">v$content[version]</td>
+       <td class="switch_sw$content[sw] bottom" align="center">
+               $content[form]
+       </td>
 </tr>