Merge branch 'bug-1396'
This commit is contained in:
commit
8a5059809e
57 changed files with 3596 additions and 3594 deletions
7
.gitattributes
vendored
Normal file
7
.gitattributes
vendored
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
* text=auto
|
||||||
|
|
||||||
|
*.php text
|
||||||
|
*.html text
|
||||||
|
*.phtml text
|
||||||
|
*.js text
|
||||||
|
*.css text
|
|
@ -32,4 +32,3 @@ class ErrorController extends Zend_Controller_Action
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -101,4 +101,3 @@ class Config {
|
||||||
return $this->config;
|
return $this->config;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
|
|
@ -34,4 +34,3 @@ class HumanReadableTimeException extends BaseException {
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
?>
|
|
|
@ -13,4 +13,3 @@ print 'Day: ' . HumanReadableTime::Seconds2HR($hrf, 'd') . "\n";
|
||||||
print 'Hour: ' . HumanReadableTime::Seconds2HR($hrf, 'h') . "\n";
|
print 'Hour: ' . HumanReadableTime::Seconds2HR($hrf, 'h') . "\n";
|
||||||
print 'Minute: ' . HumanReadableTime::Seconds2HR($hrf, 'm') . "\n";
|
print 'Minute: ' . HumanReadableTime::Seconds2HR($hrf, 'm') . "\n";
|
||||||
print 'Second: ' . HumanReadableTime::Seconds2HR($hrf, 's') . "\n";
|
print 'Second: ' . HumanReadableTime::Seconds2HR($hrf, 's') . "\n";
|
||||||
|
|
||||||
|
|
|
@ -95,4 +95,3 @@ class BaseException extends Exception {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
|
Loading…
Reference in a new issue