diff --git a/app/design/adminhtml/default/default/template/dashboard/grid.phtml b/app/design/adminhtml/default/default/template/dashboard/grid.phtml index 027b2b964c6..d432d701fc6 100644 --- a/app/design/adminhtml/default/default/template/dashboard/grid.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/grid.phtml @@ -26,7 +26,7 @@ ?> getColumns()); +$numColumns = count($this->getColumns()); ?> getCollection()): ?>
diff --git a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml b/app/design/adminhtml/default/default/template/dashboard/salebar.phtml index c72cc501757..fcb6cd338e1 100644 --- a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/salebar.phtml @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getTotals()) > 0 ): ?> +getTotals()) > 0): ?> getTotals() as $_total ): ?>

diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml index c384687a2b8..b0510371af3 100644 --- a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml +++ b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getTotals()) > 0 ): ?> +getTotals()) > 0): ?>
diff --git a/app/design/adminhtml/default/default/template/report/grid.phtml b/app/design/adminhtml/default/default/template/report/grid.phtml index c1eaf1de5a7..5a3d9e79f0b 100644 --- a/app/design/adminhtml/default/default/template/report/grid.phtml +++ b/app/design/adminhtml/default/default/template/report/grid.phtml @@ -34,7 +34,7 @@ * getPagerVisibility() * getVarNamePage() */ -$numColumns = sizeof($this->getColumns()); +$numColumns = count($this->getColumns()); ?> getCollection()): ?> canDisplayContainer()): ?> diff --git a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml index 7007c5591bb..478d5d26a52 100644 --- a/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml +++ b/app/design/adminhtml/default/default/template/sales/order/totalbar.phtml @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getTotals()) > 0 ): ?> +getTotals()) > 0): ?>
diff --git a/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml b/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml index 4799327d184..9f5f96d4513 100644 --- a/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml +++ b/app/design/adminhtml/default/default/template/system/currency/rate/matrix.phtml @@ -37,8 +37,10 @@ $_rates = ( $_newRates ) ? $_newRates : $_oldRates; - getAllowedCurrencies() as $_currencyCode ): ?> - + getAllowedCurrencies(); ?> + + + diff --git a/app/design/adminhtml/default/default/template/widget/grid.phtml b/app/design/adminhtml/default/default/template/widget/grid.phtml index bfeefd45d4d..8bb8c75f177 100644 --- a/app/design/adminhtml/default/default/template/widget/grid.phtml +++ b/app/design/adminhtml/default/default/template/widget/grid.phtml @@ -35,7 +35,7 @@ * getPagerVisibility() * getVarNamePage() */ -$numColumns = sizeof($this->getColumns()); +$numColumns = count($this->getColumns()); ?> getCollection()): ?> canDisplayContainer()): ?> diff --git a/app/design/frontend/base/default/template/catalog/product/list.phtml b/app/design/frontend/base/default/template/catalog/product/list.phtml index 038538b47e8..6ca674aeb97 100644 --- a/app/design/frontend/base/default/template/catalog/product/list.phtml +++ b/app/design/frontend/base/default/template/catalog/product/list.phtml @@ -32,7 +32,8 @@ */ ?> getLoadedProductCollection(); + $_productCollection = $this->getLoadedProductCollection(); + $_productCollectionCount = count($_productCollection); $_helper = $this->helper('catalog/output'); $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()))); ?> @@ -46,7 +47,7 @@
    -
  1. +
  2. <?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?> diff --git a/app/design/frontend/base/default/template/catalogsearch/term.phtml b/app/design/frontend/base/default/template/catalogsearch/term.phtml index a3ab1232818..5e0dd1755e3 100644 --- a/app/design/frontend/base/default/template/catalogsearch/term.phtml +++ b/app/design/frontend/base/default/template/catalogsearch/term.phtml @@ -27,7 +27,7 @@

    __('Popular Search Terms') ?>

    -getTerms()) > 0 ): ?> +getTerms()) > 0): ?>
      getTerms() as $_term): ?>
    • escapeHtml($_term->getName()) ?>
    • diff --git a/app/design/frontend/base/default/template/sales/order/recent.phtml b/app/design/frontend/base/default/template/sales/order/recent.phtml index fe1392bd372..274ab6de712 100644 --- a/app/design/frontend/base/default/template/sales/order/recent.phtml +++ b/app/design/frontend/base/default/template/sales/order/recent.phtml @@ -28,9 +28,9 @@ getOrders(); ?>

      __('Recent Orders') ?>

      - getItems()) > 0 ): ?>__('View All') ?> + getItems()) > 0): ?>__('View All') ?>
      -getItems()) > 0 ): ?> +getItems()) > 0): ?>
 escapeHtml($_currencyCode) ?>escapeHtml($_currencyCode) ?>
diff --git a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml index bcb5e6923e6..b8640f98186 100644 --- a/app/design/frontend/base/default/template/shipping/tracking/popup.phtml +++ b/app/design/frontend/base/default/template/shipping/tracking/popup.phtml @@ -30,14 +30,15 @@

__('Tracking Information'); ?>

-0): ?> + 0): ?> $_result): ?>

__('Shipment #').$shipid; ?>

- 0): ?> - - + 0): ?> +
diff --git a/app/design/frontend/base/default/template/tag/cloud.phtml b/app/design/frontend/base/default/template/tag/cloud.phtml index a52fe6f8321..7bf53eb4dfc 100644 --- a/app/design/frontend/base/default/template/tag/cloud.phtml +++ b/app/design/frontend/base/default/template/tag/cloud.phtml @@ -27,7 +27,7 @@

__('All Tags') ?>

-getTags()) > 0 ): ?> +getTags()) > 0): ?>
    getTags() as $_tag): ?>
  • escapeHtml($_tag->getName()) ?>
  • diff --git a/app/design/frontend/base/default/template/tag/customer/recent.phtml b/app/design/frontend/base/default/template/tag/customer/recent.phtml index 0ba0c5cf685..e9d289ce056 100644 --- a/app/design/frontend/base/default/template/tag/customer/recent.phtml +++ b/app/design/frontend/base/default/template/tag/customer/recent.phtml @@ -40,8 +40,10 @@ __('Tags:') ?> diff --git a/app/design/frontend/base/default/template/tag/customer/view.phtml b/app/design/frontend/base/default/template/tag/customer/view.phtml index b3fe687b534..a2471851ab8 100644 --- a/app/design/frontend/base/default/template/tag/customer/view.phtml +++ b/app/design/frontend/base/default/template/tag/customer/view.phtml @@ -35,7 +35,7 @@
    getToolbarHtml() ?>
-getMyProducts()) > 0 ): ?> +getMyProducts()) > 0): ?> diff --git a/app/design/frontend/default/iphone/template/sales/order/recent.phtml b/app/design/frontend/default/iphone/template/sales/order/recent.phtml index f4f6364ad58..58ce12a22ba 100644 --- a/app/design/frontend/default/iphone/template/sales/order/recent.phtml +++ b/app/design/frontend/default/iphone/template/sales/order/recent.phtml @@ -26,10 +26,10 @@ ?>
getOrders(); ?> -

__('Recent Orders') ?>getItems()) > 0 ): ?> | __('View All') ?>

+

__('Recent Orders') ?>getItems()) > 0): ?> | __('View All') ?>

getChildHtml()?> -getItems()) > 0 ): ?> +getItems()) > 0): ?>
diff --git a/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml b/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml index 28f74980491..14aee07dd03 100644 --- a/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml +++ b/app/design/frontend/default/iphone/template/shipping/tracking/popup.phtml @@ -24,18 +24,18 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ ?> -getTrackingInfo() ?> +getTrackingInfo() ?>
-0): ?> + 0): ?> $_result): ?>
__('Shipment #').$shipid; ?>
- 0): ?> - + 0): ?> +
@@ -125,7 +125,7 @@
- getProgressdetail())>0): ?> + getProgressdetail()) > 0): ?>
diff --git a/app/design/frontend/default/modern/template/catalog/product/list.phtml b/app/design/frontend/default/modern/template/catalog/product/list.phtml index 30bfccb8af4..745a39bb12d 100644 --- a/app/design/frontend/default/modern/template/catalog/product/list.phtml +++ b/app/design/frontend/default/modern/template/catalog/product/list.phtml @@ -32,7 +32,8 @@ */ ?> getLoadedProductCollection(); + $_productCollection = $this->getLoadedProductCollection(); + $_productCollectionCount = count($_productCollection); $_helper = $this->helper('catalog/output'); ?> count()): ?> @@ -45,7 +46,7 @@
    -
  1. +
  2. <?php echo $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true) ?> diff --git a/app/design/frontend/rwd/default/template/catalog/product/list.phtml b/app/design/frontend/rwd/default/template/catalog/product/list.phtml index 90b345daa2e..4c0526f8765 100644 --- a/app/design/frontend/rwd/default/template/catalog/product/list.phtml +++ b/app/design/frontend/rwd/default/template/catalog/product/list.phtml @@ -33,7 +33,8 @@ /* @var $this Mage_Catalog_Block_Product_List */ ?> getLoadedProductCollection(); + $_productCollection = $this->getLoadedProductCollection(); + $_productCollectionCount = count($_productCollection); $_helper = $this->helper('catalog/output'); $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()))); ?> @@ -47,7 +48,7 @@
      -
    1. +
    2. getLoadedProductCollection(); +$_productCollection = $this->getLoadedProductCollection(); +$_productCollectionCount = count($_productCollection); $_helper = $this->helper('catalog/output'); $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()))); ?> @@ -47,7 +48,7 @@ $_params = $this->escapeHtml(json_encode(array('form_key' => $this->getFormKey()
        -
      1. +
      2. getOrders(); ?> -getItems()) > 0 ): ?> +getItems()) > 0): ?>
diff --git a/lib/Net/IDNA2.php b/lib/Net/IDNA2.php index 130086c385f..3f948f0fcba 100644 --- a/lib/Net/IDNA2.php +++ b/lib/Net/IDNA2.php @@ -2382,7 +2382,7 @@ public function encode($decoded, $one_time_encoding = false) } // Catch the rest of the string if ($last_begin) { - $inp_len = sizeof($decoded); + $inp_len = count($decoded); $encoded = ''; $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin))); if ($encoded) { @@ -3399,4 +3399,4 @@ public static function singleton($params = array()) // }}} } -?> \ No newline at end of file +?> diff --git a/lib/Varien/Convert/Container/Collection.php b/lib/Varien/Convert/Container/Collection.php index 28688e97c08..eb0c982dcd8 100644 --- a/lib/Varien/Convert/Container/Collection.php +++ b/lib/Varien/Convert/Container/Collection.php @@ -49,7 +49,7 @@ public function addItem($name, Varien_Convert_Container_Interface $item) if ($item->getName()) { $name = $item->getName(); } else { - $name = sizeof($this->_items); + $name = count($this->_items); } } diff --git a/lib/Varien/Convert/Parser/Xml/Excel.php b/lib/Varien/Convert/Parser/Xml/Excel.php index f872ade4175..5126314d153 100644 --- a/lib/Varien/Convert/Parser/Xml/Excel.php +++ b/lib/Varien/Convert/Parser/Xml/Excel.php @@ -82,7 +82,7 @@ public function parse() } } $data[$wsName] = $wsData; - $this->addException('Found worksheet "'.$wsName.'" with '.sizeof($wsData).' row(s)'); + $this->addException('Found worksheet "' .$wsName . '" with ' . count($wsData) . ' row(s)'); } if ($wsName = $this->getVar('single_sheet')) { if (isset($data[$wsName])) { diff --git a/lib/Varien/Event/Observer/Cron.php b/lib/Varien/Event/Observer/Cron.php index fa533b6b78d..89181eec857 100644 --- a/lib/Varien/Event/Observer/Cron.php +++ b/lib/Varien/Event/Observer/Cron.php @@ -49,7 +49,7 @@ class Varien_Event_Observer_Cron extends Varien_Event_Observer public function isValidFor(Varien_Event $event) { $e = preg_split('#\s+#', $this->getCronExpr(), null, PREG_SPLIT_NO_EMPTY); - if (sizeof($e)!==5) { + if (count($e) !== 5) { return false; } @@ -98,7 +98,7 @@ public function matchCronExpression($expr, $num) // handle modulus if (strpos($expr,'/')!==false) { $e = explode('/', $expr); - if (sizeof($e)!==2) { + if (count($e) !== 2) { return false; } $expr = $e[0]; @@ -113,7 +113,7 @@ public function matchCronExpression($expr, $num) // handle range if (strpos($expr,'-')!==false) { $e = explode('-', $expr); - if (sizeof($e)!==2) { + if (count($e) !== 2) { return false; } diff --git a/lib/Varien/Simplexml/Element.php b/lib/Varien/Simplexml/Element.php index 48528093d59..497dda2e8fb 100644 --- a/lib/Varien/Simplexml/Element.php +++ b/lib/Varien/Simplexml/Element.php @@ -453,7 +453,7 @@ public function setNode($path, $value, $overwrite=true) foreach ($arr1 as $v) { if (!empty($v)) $arr[] = $v; } - $last = sizeof($arr)-1; + $last = count($arr) - 1; $node = $this; foreach ($arr as $i=>$nodeName) { if ($last===$i) {