[Svn-src-all:3909] [version-2_13-dev 22823] #2248 (PHP 警告撲滅 for 2.13.0)

[Seasoft]

Subversion committed to /home/svn/open 22823
http://svn.ec-cube.net/open_trac/changeset/22823
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2013-05-19 20:34:20 +0900 (日, 19  5月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2248 (PHP 警告撲滅 for 2.13.0)

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php
U   branches/version-2_13-dev/data/class/helper/SC_Helper_Transform.php

変更: branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php	2013-05-19 04:42:45 UTC (rev 22822)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php	2013-05-19 11:34:20 UTC (rev 22823)
@@ -161,6 +161,7 @@
     function getBlocPositions($device_type_id, $page_id, $has_realpath = true)
     {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
+
         $table = <<< __EOF__
         dtb_blocposition AS pos
             JOIN dtb_bloc AS bloc
@@ -173,18 +174,20 @@
         if ($has_realpath) {
             $this->setBlocPathTo($device_type_id, $arrBlocs);
         }
-        
+
         //全ページ設定と各ページのブロックの重複を削除
+        $arrUniqBlocIds = array();
         foreach ($arrBlocs as $index => $arrBloc) {
-            if($arrBloc['anywhere'] == 1){
+            if ($arrBloc['anywhere'] == 1){
                 $arrUniqBlocIds[] = $arrBloc['bloc_id'];
             }
         }
         foreach ($arrBlocs as $bloc_index => $arrBlocData) {
-            if(in_array($arrBlocData['bloc_id'], $arrUniqBlocIds) && $arrBlocData['anywhere'] == 0){
+            if (in_array($arrBlocData['bloc_id'], $arrUniqBlocIds) && $arrBlocData['anywhere'] == 0){
                 unset($arrBlocs[$bloc_index]);
             }
         }
+
         return $arrBlocs;
     }
 

変更: branches/version-2_13-dev/data/class/helper/SC_Helper_Transform.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_Transform.php	2013-05-19 04:42:45 UTC (rev 22822)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_Transform.php	2013-05-19 11:34:20 UTC (rev 22823)
@@ -235,8 +235,10 @@
      */
     public function insertBefore($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('insertBefore', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('insertBefore', $objElement[0], $html_snip);
+            }
         }
         return $this;
     }
@@ -250,8 +252,10 @@
      */
     public function insertAfter($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('insertAfter', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('insertAfter', $objElement[0], $html_snip);
+            }
         }
         return $this;
     }
@@ -265,8 +269,10 @@
      */
     public function appendFirst($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('appendFirst', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('appendFirst', $objElement[0], $html_snip);
+            }
         }
         return $this;
     }
@@ -280,8 +286,10 @@
      */
     public function appendChild($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
-            $this->lfSetTransform('appendChild', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => $objElement) {
+                $this->lfSetTransform('appendChild', $objElement[0], $html_snip);
+            }
         }
         return $this;
     }
@@ -295,8 +303,10 @@
      */
     public function replaceElement($html_snip)
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
-            $this->lfSetTransform('replaceElement', $objElement[0], $html_snip);
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
+                $this->lfSetTransform('replaceElement', $objElement[0], $html_snip);
+            }
         }
         return $this;
     }
@@ -309,8 +319,10 @@
      */
     public function removeElement()
     {
-        foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
-            $this->lfSetTransform('replaceElement', $objElement[0], '');
+        if (isset($this->arrSelectElements[$this->search_depth])) {
+            foreach ($this->arrSelectElements[$this->search_depth] as $key => &$objElement) {
+                $this->lfSetTransform('replaceElement', $objElement[0], '');
+            }
         }
         return $this;
     }
@@ -578,7 +590,6 @@
         } else {
             $this->arrSelectElements[$this->search_depth][$arrElement[0]] = array($elementNo, &$arrElement[1]);
         }
-
     }