[xoops-svn] SF.net SVN: xoops-svn:[10938] XoopsCore/branches/2.5.x/2.5.6

[<be...@us...>]

Revision: 10938
          http://sourceforge.net/p/xoops/svn/10938
Author:   beckmi
Date:     2013-01-28 00:24:47 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
fix for Array to string conversion (geekwright/mamba)

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php

Modified: XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-27 23:58:59 UTC (rev 10937)
+++ XoopsCore/branches/2.5.x/2.5.6/docs/changelog.250.txt	2013-01-28 00:24:47 UTC (rev 10938)
@@ -4,6 +4,7 @@
 2013/01/xx: Version 2.5.6 RC1
 ===============================
 Bugfixes:
+ - Array to string conversion (geekwright/mamba)
  - issues with missing xoopscomments table (geekwright/sabahan/Mamba)
  - bug with using reference for non-variables (geekwright/mamba)
  - number of users when "all groups" selected was wrong (tatane/mamba) 

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php	2013-01-27 23:58:59 UTC (rev 10937)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/preferences/main.php	2013-01-28 00:24:47 UTC (rev 10938)
@@ -121,14 +121,16 @@
 
                 case 'theme':
                 case 'theme_multi':
-                    $ele = ($config[$i]->getVar('conf_formtype') != 'theme_multi') ? new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
+                    $ele = ($config[$i]->getVar('conf_formtype')
+                        != 'theme_multi') ? new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput(), 5, true);
                     require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
                     $dirlist = XoopsLists::getThemesList();
                     if (!empty($dirlist)) {
                         asort($dirlist);
                         $ele->addOptionArray($dirlist);
                     }
-                    $form->addElement(new XoopsFormHidden('_old_theme', $config[$i]->getConfValueForOutput()));
+                    $valueForOutput = $config[$i]->getConfValueForOutput();
+                    $form->addElement(new XoopsFormHidden('_old_theme', (is_array($valueForOutput) ? $valueForOutput[0] : $valueForOutput)));
                     break;
 
                 case 'tplset':