[icinga-checkins] icinga.org: icinga-web/mhein/extlayout: * php5.3 issues

git at icinga.org git at icinga.org
Tue May 11 19:18:12 CEST 2010


Module: icinga-web
Branch: mhein/extlayout
Commit: 5b605c32b4484a1bc8adb866ded4d0eeccd0ed3b
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=5b605c32b4484a1bc8adb866ded4d0eeccd0ed3b

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue May 11 19:16:02 2010 +0200

* php5.3 issues

---

 app/data/i18n/po                                   |    2 +-
 .../AppKit/views/Ext/initI18nSuccessView.class.php |    2 +-
 .../Cronks/models/System/CronkDataModel.class.php  |    4 ++--
 lib/appkit/auth/AppKitSecurityUser.class.php       |    2 +-
 lib/appkit/util/AppKitFormatParserUtil.class.php   |    4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/data/i18n/po b/app/data/i18n/po
index 48da4ed..0b3f2c3 160000
--- a/app/data/i18n/po
+++ b/app/data/i18n/po
@@ -1 +1 @@
-Subproject commit 48da4ed97fee4cd8c199a5ee5ba7ee19ef7594c3
+Subproject commit 0b3f2c349b64acbca70ac72bce87b7e1f8374905
diff --git a/app/modules/AppKit/views/Ext/initI18nSuccessView.class.php b/app/modules/AppKit/views/Ext/initI18nSuccessView.class.php
index 650646f..0deb243 100755
--- a/app/modules/AppKit/views/Ext/initI18nSuccessView.class.php
+++ b/app/modules/AppKit/views/Ext/initI18nSuccessView.class.php
@@ -18,7 +18,7 @@ class AppKit_Ext_initI18nSuccessView extends AppKitBaseView
 		$files = array ();
 		
 		$default = $tm->getDefaultDomain();
-		$defaults = split('\.', $default);
+		$defaults = explode('.', $default);
 		
 		$translator = $tm->getDomainTranslator($default, AgaviTranslationManager::MESSAGE);
 		
diff --git a/app/modules/Cronks/models/System/CronkDataModel.class.php b/app/modules/Cronks/models/System/CronkDataModel.class.php
index 8d711fd..184b001 100644
--- a/app/modules/Cronks/models/System/CronkDataModel.class.php
+++ b/app/modules/Cronks/models/System/CronkDataModel.class.php
@@ -189,7 +189,7 @@ class Cronks_System_CronkDataModel extends CronksBaseModel {
 	}
 	
 	private function testArrayIntersects($totest, array $against=array()) {
-		if (!is_array($totest) && is_string($totest)) $totest = split(',', $totest);
+		if (!is_array($totest) && is_string($totest)) $totest = explode(',', $totest);
 		$t = array_intersect($totest, $against);
 		if (is_array($t) && count($t)>0) {
 			return true;
@@ -240,4 +240,4 @@ class Cronks_System_CronkDataModel extends CronksBaseModel {
 	
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/lib/appkit/auth/AppKitSecurityUser.class.php b/lib/appkit/auth/AppKitSecurityUser.class.php
index e1b339d..1cd30c5 100644
--- a/lib/appkit/auth/AppKitSecurityUser.class.php
+++ b/lib/appkit/auth/AppKitSecurityUser.class.php
@@ -84,7 +84,7 @@ class AppKitSecurityUser extends AgaviRbacSecurityUser {
 	 * @author Marius Hein
 	 */
 	private function loadUserAttribute(NsmUser &$user) {
-		$this->setAttributeByRef('userobj', &$user);
+		$this->setAttributeByRef('userobj', $user);
 		return true;
 	}
 	
diff --git a/lib/appkit/util/AppKitFormatParserUtil.class.php b/lib/appkit/util/AppKitFormatParserUtil.class.php
index 5c70391..178fadb 100644
--- a/lib/appkit/util/AppKitFormatParserUtil.class.php
+++ b/lib/appkit/util/AppKitFormatParserUtil.class.php
@@ -111,7 +111,7 @@ class AppKitFormatParserUtil {
 		
 		if (preg_match_all('@\$\{([^\}]+)\}@', $format, $m, PREG_SET_ORDER)) {
 			foreach ($m as $match) {
-				$parts = split('\.', $match[1]);
+				$parts = explode('.', $match[1]);
 				$namespace = array_shift($parts);
 				
 				$args = $this->extractArgs($match[1]);
@@ -181,4 +181,4 @@ class AppKitFormatParserUtil {
 
 class AppKitFormatParserUtilException extends AppKitException {}
 
-?>
\ No newline at end of file
+?>





More information about the icinga-checkins mailing list