------------------------------------------------------------
revno: 840
committer: Steven Garcia <steven@satellite>
branch nick: aikiframework
timestamp: Sun 2011-06-12 22:31:18 -0700
message:
Added fix to log testing for false contents. Removed group argument from
chown command in makefile. Bumped fix-number.
modified:
Makefile.am
src/aiki.php
src/system/libraries/Log.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'Makefile.am'
--- Makefile.am 2011-06-13 00:47:27 +0000
+++ Makefile.am 2011-06-13 05:31:18 +0000
@@ -187,7 +187,7 @@
install-data-hook : install-desktop install-mysql-aiki
@$(MKDIR) -p $(DESTDIR)$(AIKI_LOG_DIR)
@$(CHMOD) 0700 $(DESTDIR)$(AIKI_LOG_DIR)
- @$(CHOWN) $(HTTPD_USER):$(HTTPD_USER) $(DESTDIR)$(AIKI_LOG_DIR) &> /dev/null || :
+ @$(CHOWN) $(HTTPD_USER) $(DESTDIR)$(AIKI_LOG_DIR) &> /dev/null || :
@for d in $$($(FIND) $(DESTDIR)$(sysconfdir)/$(PACKAGE) -type d); do $(CHMOD) 0755 $$d; done
@for f in $$($(FIND) $(DESTDIR)$(sysconfdir)/$(PACKAGE) -type f); do $(CHMOD) 0644 $$f; done
@for d in $$($(FIND) $(DESTDIR)$(pkgdatadir) -type d); do $(CHMOD) 0755 $$d; done
=== modified file 'src/aiki.php'
--- src/aiki.php 2011-06-13 03:10:01 +0000
+++ src/aiki.php 2011-06-13 05:31:18 +0000
@@ -25,7 +25,7 @@
* When the MAJOR number changes, the MINOR number should reset to zero.
* When the MAJOR number is zero, this indicates an alpha or beta type
* release. Each number can, but should probably not exceed 99 */
-define('AIKI_VERSION','0.8.16');
+define('AIKI_VERSION','0.8.17');
/**
* Used to test for script access
=== modified file 'src/system/libraries/Log.php'
--- src/system/libraries/Log.php 2011-06-13 03:10:01 +0000
+++ src/system/libraries/Log.php 2011-06-13 05:31:18 +0000
@@ -223,7 +223,7 @@
* @return mixed The log file contents or FALSE on failure. */
public function getContents() {
$contents = file_get_contents($this->_path);
- if (!$contents) {
+ if (false === $contents) {
$contents = file_get_contents($this->_root . "/" . $this->_path);
}
return $contents;
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
