MERGE: リビジョン1873〜1893。skinnable-masterのマージ

[nucleus-jp/nucleus-next.git] / nucleus / libs / AdminActions.php

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index a39c26c..1446c84 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -426,17 +426,17 @@ class AdminActions extends BaseActions
                                'contents',
                                'pluginextras',
                                'eventformextra',
-                               );\r
+                               );
                                break;
                        case 'createaccountsuccess':
-                               $extra_actions = array(\r
+                               $extra_actions = array(
                                'contents',
-                               );\r
+                               );
                                break;
                        case 'createaccountdisable':
                                $extra_actions = array(
                                /* nothing special */
-                               );\r
+                               );
                                break;
                        case 'createitem':
                                $extra_actions = array(
@@ -3389,39 +3389,39 @@ class AdminActions extends BaseActions
                /* default option */
                if ( $this->skintype == 'editmembersettings' )
                {
-                       if ( !$member->getLocale() )\r
-                       {\r
-                               echo "<option value=\"\" selected=\"selected\">" . Entity::hsc(_MEMBERS_USESITELANG) . "</option>\n";\r
-                       }\r
-                       else\r
-                       {\r
-                               echo "<option value=\"\">" . Entity::hsc(_MEMBERS_USESITELANG) . "</option>\n";\r
-                       }\r
+                       if ( !$member->getLocale() )
+                       {
+                               echo "<option value=\"\" selected=\"selected\">" . Entity::hsc(_MEMBERS_USESITELANG) . "</option>\n";
+                       }
+                       else
+                       {
+                               echo "<option value=\"\">" . Entity::hsc(_MEMBERS_USESITELANG) . "</option>\n";
+                       }
                }
                else
                {
-                       if ( $CONF['Locale'] == 'en_Latn_US' )\r
-                       {\r
-                               echo "<option value=\"\" selected=\"selected\">" . Entity::hsc(_LOCALE_EN_LATN_US) . "</option>\n";\r
-                       }\r
-                       else\r
-                       {\r
-                               echo "<option value=\"\">" . Entity::hsc(_LOCALE_EN_LATN_US) . "</option>\n";\r
-                       }\r
+                       if ( $CONF['Locale'] == 'en_Latn_US' )
+                       {
+                               echo "<option value=\"\" selected=\"selected\">" . Entity::hsc(_LOCALE_EN_LATN_US) . "</option>\n";
+                       }
+                       else
+                       {
+                               echo "<option value=\"\">" . Entity::hsc(_LOCALE_EN_LATN_US) . "</option>\n";
+                       }
                }
                
                /* optional options */
                foreach ( $locales as $locale )
                {
-                       if ( $this->skintype == 'editmembersettings' )\r
+                       if ( $this->skintype == 'editmembersettings' )
                        {
-                               if ( $locale != $member->getLocale() )\r
-                               {\r
-                                       echo "<option value=\"{$locale}\">";\r
-                               }\r
-                               else\r
-                               {\r
-                                       echo "<option value=\"{$locale}\" selected=\"selected\">";\r
+                               if ( $locale != $member->getLocale() )
+                               {
+                                       echo "<option value=\"{$locale}\">";
+                               }
+                               else
+                               {
+                                       echo "<option value=\"{$locale}\" selected=\"selected\">";
                                }
                        }
                        else
@@ -3431,14 +3431,14 @@ class AdminActions extends BaseActions
                                        /* already output */
                                        continue;
                                }
-                               else if ( $locale != $CONF['Locale'] )\r
-                               {\r
-                                       echo "<option value=\"{$locale}\">";\r
-                               }\r
-                               else\r
-                               {\r
-                                       echo "<option value=\"{$locale}\" selected=\"selected\">";\r
-                               }\r
+                               else if ( $locale != $CONF['Locale'] )
+                               {
+                                       echo "<option value=\"{$locale}\">";
+                               }
+                               else
+                               {
+                                       echo "<option value=\"{$locale}\" selected=\"selected\">";
+                               }
                        }
                        $label = '_LOCALE_' . strtoupper($locale);
                        if ( !defined($label) )
@@ -3449,7 +3449,7 @@ class AdminActions extends BaseActions
                        {
                                echo constant($label);
                        }
-                       echo "</option>\n";\r
+                       echo "</option>\n";
                }
                return;
        }